Laurent Destailleur 45ddde6940 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/expensereport/class/expensereport.class.php htdocs/holiday/class/holiday.class.php htdocs/index.php		2020-05-23 20:18:10 +02:00
..
holiday.class.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-05-23 20:18:10 +02: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