Laurent Destailleur 371dec8503 Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql htdocs/langs/en_US/products.lang htdocs/langs/fr_FR/companies.lang		2016-02-24 12:13:12 +01:00
..
ckeditor
img	Move files from common directory to each template	2016-02-13 06:58:46 +01:00
tpl
.gitignore
AUTHOR
graph-color.php	Fixed md theme name	2015-12-04 18:04:41 +01:00
index.html
style.css.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-02-24 12:13:12 +01:00
thumb.png