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

..

config

Changed product_brand fk

2014-06-26 15:50:00 +02:00

media

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

modules

Merge branch 'master' into brands

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

session

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

.gitkeep

set execution right // no more troubles

2013-06-20 15:21:16 +02:00