Laurent Destailleur 6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/contrat/class/contrat.class.php htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/expensereport/class/expensereport.class.php		2020-10-15 20:38:32 +02: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 '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-10-15 20:38:32 +02:00
index.html	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2019-06-29 16:46:16 +02:00