Manuel Raynaud 3f405d1ce9 Merge branch 'master' of github.com:thelia/thelia ...

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml

2013-09-04 17:57:41 +02:00

..

lib/Thelia

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

2013-09-04 17:57:41 +02:00

bootstrap.php

Product loop adjustements

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