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

..

lib/Thelia

Merge branch 'master' into brands

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

bootstrap.php

various fixes from insight

2014-06-18 09:33:32 +02:00