franck 14e0eff0f5 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/admin-layout.tpl

2013-09-12 13:04:12 +02:00

..

routing

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-12 13:04:12 +02:00

action.xml

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

config.xml

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-12 13:04:12 +02:00

routing.xml

create router for rewriting matching

2013-09-05 20:46:46 +02:00