2 Commits

Author	SHA1	Message	Date
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
franck	e4c23adba6	Smarty inheritance in admin template.	2013-09-03 11:26:03 +02:00