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	More fa image to replace png picto	2018-03-14 20:08:44 +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-19 17:58:19 +01:00
thumb.png