Laurent Destailleur 7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinterrec.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php		2021-01-02 17:01:03 +01:00
..
api_contracts.class.php	doxygen	2020-11-25 18:12:59 +01:00
contrat.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-01-02 17:01:03 +01:00
index.html	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2019-06-29 16:46:16 +02:00