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

Conflicts:
	core/lib/Thelia/Controller/BaseController.php

2013-09-03 19:03:27 +02:00

..

lib/Thelia

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

2013-09-03 19:03:27 +02:00

bootstrap.php

Product loop adjustements

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