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

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

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

..

action.xml

refactor action factory, className are inject from service container

2013-05-21 21:17:40 +02:00

config.xml

create new command allowing to install thelia using cli tools

2013-06-05 14:23:05 +02:00

routing.xml

Changement emplacmement templates

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