Laurent Destailleur 0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/step5.php htdocs/langs/en_US/holiday.lang htdocs/public/payment/newpayment.php htdocs/public/stripe/newpayment.php		2018-03-19 17:58:19 +01:00
..
ckeditor	Fix regression	2017-12-12 10:13:48 +01:00
img	Work on ticket module integration	2018-03-13 12:13:47 +01:00
tpl
.gitignore
AUTHOR
graph-color.php	Fix bookmark jump	2017-05-06 21:39:00 +02:00
index.html
style.css.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-19 17:58:19 +01:00
thumb.png