Laurent Destailleur 7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contrat/card.php htdocs/expensereport/card.php htdocs/fichinter/list.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php htdocs/fourn/paiement/card.php htdocs/livraison/card.php htdocs/modulebuilder/template/myobject_list.php htdocs/societe/rib.php htdocs/supplier_proposal/list.php htdocs/user/card.php		2017-10-18 19:51:29 +02:00
..
ckeditor	Start to work on email sender profiles	2017-10-13 12:02:26 +02:00
img	NEW add image object_phoning_mobile.png	2017-10-10 10:37:57 +02: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 '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-18 19:51:29 +02:00
thumb.png