Franck Allimant ca862b07e4 Merge branch 'master' into brands ...

Conflicts:
	core/lib/Thelia/Tools/FileManager.php
	setup/update/2.0.3.sql

2014-06-26 16:35:08 +02:00

..

Admin

Merge branch 'master' into brands

2014-06-26 16:35:08 +02:00

Front

Free shipping for selected countries and/or shipping methods

2014-05-15 20:25:22 +02:00

BaseController.php

implement new breadcrumb on image and document edition in the catalog

2014-06-11 14:50:19 +02:00