Etienne Roudeix 84204cbf05 Merge branch 'master' into template ...

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

2013-09-16 15:32:17 +02:00

..

lib/Thelia

Merge branch 'master' into template

2013-09-16 15:32:17 +02:00

bootstrap.php

Product loop adjustements

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