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

Conflicts:
	core/lib/Thelia/Controller/BaseController.php

2013-09-03 19:03:27 +02:00

..

routing

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

2013-09-03 19:03:27 +02:00

action.xml

Smarty inheritance in admin template.

2013-09-03 11:26:03 +02:00

config.xml

Added AdminUtilities Smarty plugin, optimized templates

2013-09-03 15:43:05 +02:00

routing.xml

make more easy routin integration from modules

2013-08-14 11:23:51 +02:00