4 Commits

Author	SHA1	Message	Date
franck	0719c8b740	Merge branch 'admin' of https://github.com/thelia/thelia into admin ... Conflicts: core/lib/Thelia/Admin/Templating/Template.class.php	2013-06-18 15:35:36 +02:00
franck	797f0e2e38	Testing smarty parser	2013-06-18 15:31:32 +02:00
Manuel Raynaud	fa69e6e7f0	change rule in .htaccess and fix link for asset	2013-06-18 12:24:45 +02:00
franck	9d8c07775b	Integration de assetic	2013-06-17 15:36:05 +02:00