Etienne Roudeix 66536d0b31 Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Product.php

2013-09-18 20:03:13 +02:00

..

lib/Thelia

Merge branch 'master' into template

2013-09-18 20:03:13 +02:00

bootstrap.php

Product loop adjustements

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