Etienne Roudeix 233c952b4e Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Model/Base/Module.php
	core/lib/Thelia/Model/Base/ModuleQuery.php
	core/lib/Thelia/Model/Map/ModuleTableMap.php
	install/thelia.sql
	local/config/schema.xml

2013-09-17 12:44:34 +02:00

..

lib/Thelia

Merge branch 'master' into template

2013-09-17 12:44:34 +02:00

bootstrap.php

Product loop adjustements

2013-08-01 10:53:35 +02:00