Laurent Destailleur f9ef6f52a6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/skeleton_list.php		2016-12-07 12:23:43 +01:00
..
contrat.class.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-07 12:23:43 +01:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00