Laurent Destailleur 5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/modules/modStripe.class.php htdocs/filefunc.inc.php htdocs/projet/element.php		2018-09-20 23:43:34 +02:00
..
ckeditor	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
img	Fix conflict with external ticketsup module	2018-06-04 21:49:29 +02: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 '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-20 23:43:34 +02:00
thumb.png