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

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

2013-09-06 17:48:12 +02:00

..

lib/Thelia

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

2013-09-06 17:48:12 +02:00

bootstrap.php

Product loop adjustements

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