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

..

2.0.0-beta2.sql

rename /install dir

2014-04-17 17:49:15 +02:00

2.0.0-beta3.sql

rename /install dir

2014-04-17 17:49:15 +02:00

2.0.0-beta4.sql

rename /install dir

2014-04-17 17:49:15 +02:00

2.0.0-RC1.sql

rename /install dir

2014-04-17 17:49:15 +02:00

2.0.0.sql

fix update process

2014-04-22 14:46:10 +02:00

2.0.1.sql

add new languages in dsl scripts

2014-05-06 11:13:29 +02:00

2.0.2.sql

Update 2.0.2.sql

2014-05-28 14:56:46 +02:00

2.0.3.sql

Merge branch 'master' into brands

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