Laurent Destailleur 2d9135b6ad Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expedition/card.php htdocs/holiday/list.php		2019-11-01 21:06:06 +01:00
..
contact.class.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-01 21:06:06 +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