Laurent Destailleur 1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php		2018-03-07 11:54:48 +01:00
..
ckeditor	Fix regression	2017-12-12 10:13:48 +01:00
img	Fix menu with smartphone	2017-12-08 19:23:13 +01:00
tpl
.gitignore
AUTHOR
graph-color.php	Fix menu with smartphone	2017-12-08 19:23:13 +01:00
index.html
style.css.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-07 11:54:48 +01:00
thumb.png