Laurent Destailleur 33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/admin.lang		2016-08-05 01:15:19 +02:00
..
ckeditor	Merge remote-tracking branch 'origin/4.0' into develop	2016-08-01 15:15:32 +02:00
img	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-08-04 10:27:50 +02: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/4.0' into develop	2016-08-05 01:15:19 +02:00
thumb.png