Etienne Roudeix dffbf76cfd Merge branch 'master' into rewrite ...

Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql

2013-09-04 10:06:22 +02:00

..

lib/Thelia

Merge branch 'master' into rewrite

2013-09-04 10:06:22 +02:00

bootstrap.php

Product loop adjustements

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