Manuel Raynaud 1e660cd930 Merge branch 'delivery' ...

Conflicts:
	composer.lock
	install/insert.sql

2013-09-07 16:37:54 +02:00

..

lib/Thelia

Merge branch 'delivery'

2013-09-07 16:37:54 +02:00

bootstrap.php

Product loop adjustements

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