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
..
ajax	FIX major issues for inventory	2017-05-02 15:19:55 +02:00
class	Fix new generic classes system	2017-07-25 01:21:20 +02:00
img
lib
tpl	Fix HTML5 use of <br> is preferred to <br />	2017-09-15 23:49:04 +02:00
card.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-18 19:51:29 +02:00
list.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-18 19:51:29 +02:00