Files
sterivein/templates
Etienne Roudeix 32f1fb3441 Merge branch 'admin' into loops
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	templates/smarty-sample/category.html
2013-07-03 09:52:06 +02:00
..