Laurent Destailleur d70c215ab8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/bankentries.php htdocs/fourn/facture/card.php		2017-10-17 11:14:58 +02:00
..
index.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-17 11:14:58 +02:00