Laurent Destailleur d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/admin.lang		2019-08-01 12:54:27 +02:00
..
api_contracts.class.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2019-06-29 16:46:16 +02:00
contrat.class.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-01 12:54:27 +02:00
index.html	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2019-06-29 16:46:16 +02:00