Laurent Destailleur eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/members.lang htdocs/langs/fr_FR/members.lang		2019-02-01 15:14:19 +01:00
..
ckeditor	Fix when using image into description	2019-01-31 18:12:34 +01:00
img	Fix conflict with external ticketsup module	2018-06-04 21:49:29 +02:00
tpl
.gitignore
AUTHOR
graph-color.php	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
index.html
style.css.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-30 16:54:38 +01:00
thumb.png