Manuel Raynaud 805b38ab9a Merge branch 'master' into content ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/folders.html

2013-09-20 17:41:38 +02:00

..

routing

Merge branch 'master' into content

2013-09-20 17:41:38 +02:00

action.xml

Started product management

2013-09-17 17:15:15 +02:00

config.xml

Merge branch 'master' into template

2013-09-20 16:32:42 +02:00

routing.xml

remove isntall routing and template

2013-09-17 16:30:15 +02:00