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

Conflicts:
	composer.lock
	install/insert.sql

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

..

Thelia

Merge branch 'delivery'

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