Laurent Destailleur 341e014a3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/don/document.php		2016-11-08 11:36:31 +01:00
..
contact.class.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-11-08 11:36:31 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00