Laurent Destailleur 8e0da9bfeb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/holiday/document.php		2017-10-04 13:32:53 +02:00
..
ckeditor	Debug module website	2017-07-09 22:30:19 +02:00
img	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-04 15:39:00 +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 branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-04 13:32:53 +02:00
thumb.png