Laurent Destailleur 8058712d47 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/index.php htdocs/contrat/class/contrat.class.php htdocs/product/list.php		2017-10-26 17:06:11 +02:00
..
api_contracts.class.php	NEW Add api validate and close on contracts	2017-10-26 12:32:22 +02:00
contrat.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-26 17:06:11 +02:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00