franck 1705e11b88 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Loop/Product.php

2013-08-01 10:56:54 +02:00

..

lib/Thelia

Merge branch 'master' of https://github.com/thelia/thelia

2013-08-01 10:56:54 +02:00

bootstrap.php

Product loop adjustements

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