Laurent Destailleur 7f9d995c9c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/holiday/card.php		2019-02-08 14:54:31 +01:00
..
holiday.class.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-08 14:54: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