Commit Graph

4 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
fce528c41f Added AdminUtilities Smarty plugin, optimized templates 2013-09-03 15:43:05 +02:00
franck
e4c23adba6 Smarty inheritance in admin template. 2013-09-03 11:26:03 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +02:00