Laurent Destailleur c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php		2017-09-25 19:55:52 +02:00
..
contrat.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-25 19:55:52 +02:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00