Etienne Roudeix 642376a6b3 Merge branch 'master' into tax ...

Conflicts:
	install/insert.sql

2013-09-11 16:57:45 +02:00

..

lib/Thelia

Merge branch 'master' into tax

2013-09-11 16:57:45 +02:00

bootstrap.php

Product loop adjustements

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