franck 14e0eff0f5 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/admin-layout.tpl

2013-09-12 13:04:12 +02:00

..

faker-assets

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

.gitkeep

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

faker_100categories_1000products_4locales.php

load test

2013-08-26 16:38:56 +02:00

faker.php

pse ref in faker

2013-09-12 11:59:45 +02:00

insert.sql

Merge branch 'master' into tax

2013-09-11 16:57:45 +02:00

INSTALL-TODO.txt

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

tax_faker.php

tax engine

2013-09-11 19:01:23 +02:00

thelia.sql

pse ref

2013-09-12 11:56:00 +02:00