Laurent Destailleur 74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/class/fournisseur.facture.class.php		2020-02-11 16:52:58 +01:00
..
api_contracts.class.php	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
contrat.class.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-11 16:52:58 +01:00
index.html	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2019-06-29 16:46:16 +02:00