Manuel Raynaud 3c87fa8bd0 Merge branch 'master' into cart ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	install/faker.php

2013-08-07 10:23:44 +02:00

..

lib/Thelia

Merge branch 'master' into cart

2013-08-07 10:23:44 +02:00

bootstrap.php

Product loop adjustements

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