Laurent Destailleur 728e36f70f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/api/index.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/api_invoices.class.php htdocs/core/actions_massactions.inc.php htdocs/core/actions_sendmails.inc.php		2017-10-22 01:43:33 +02:00
..
ckeditor	NEW Remove js library fileupload that was not used by core code.	2017-10-21 19:40:17 +02:00
img	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-22 01:43:33 +02:00
tpl
.gitignore
AUTHOR
graph-color.php	Fix bookmark jump	2017-05-06 21:39:00 +02:00
index.html
style.css.php	Fix larger select2 combo	2017-10-21 21:05:00 +02:00
thumb.png