Laurent Destailleur 6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/website.lang		2018-02-15 15:34:17 +01:00
..
api_contracts.class.php	Fix maxi debug of APIs (clean output fields)	2017-12-21 16:50:18 +01:00
contrat.class.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-15 15:34:17 +01:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00