Etienne Roudeix dffbf76cfd Merge branch 'master' into rewrite ...

Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql

2013-09-04 10:06:22 +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

Fixed customer front controller, events, addec admion config.

2013-08-30 19:46:12 +02:00

insert.sql

Merge branch 'master' into rewrite

2013-09-04 10:06:22 +02:00

INSTALL-TODO.txt

Merge branch 'master' into loops

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

thelia.sql

Completed mailing templates management

2013-09-02 16:21:49 +02:00