Laurent Destailleur 412be59f78 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php		2017-01-20 12:09:39 +01:00
..
contrat.class.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-20 12:09:39 +01:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00