Manuel Raynaud 1e660cd930 Merge branch 'delivery' ...

Conflicts:
	composer.lock
	install/insert.sql

2013-09-07 16:37:54 +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

modify insert.sql including debugBar module

2013-09-07 16:34:51 +02:00

INSTALL-TODO.txt

Merge branch 'master' into loops

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

thelia.sql

create Delivery loop

2013-09-06 18:41:44 +02:00