Etienne Roudeix dffbf76cfd Merge branch 'master' into rewrite ...

Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql

2013-09-04 10:06:22 +02:00

..

routing

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

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

action.xml

404 not found management

2013-09-04 10:02:58 +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