Etienne Roudeix 233c952b4e Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Model/Base/Module.php
	core/lib/Thelia/Model/Base/ModuleQuery.php
	core/lib/Thelia/Model/Map/ModuleTableMap.php
	install/thelia.sql
	local/config/schema.xml

2013-09-17 12:44:34 +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

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

faker.php

Merge branch 'master' into template

2013-09-17 12:44:34 +02:00

insert.sql

Merge branch 'master' into template

2013-09-17 12:44:34 +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

delivery process

2013-09-17 12:38:23 +02:00