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
..
card.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-18 19:51:29 +02:00
index.html
info.php	Look and feel v6	2017-07-08 00:42:55 +02:00
list.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-13 22:01:56 +02:00