franck 156f281162 Merge branch 'franck' into admin ...

Conflicts:
	composer.lock
	core/lib/Thelia/Core/Thelia.php

2013-06-10 16:35:49 +02:00

..

lib/Thelia

Merge branch 'franck' into admin

2013-06-10 16:35:49 +02:00

bootstrap.php

Changement emplacmement templates

2013-06-10 15:36:02 +02:00