Laurent Destailleur 2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop ... Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/modulebuilder/template/class/myobject.class.php		2019-05-19 02:15:01 +02:00
..
holiday.class.php	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop	2019-05-19 02:15:01 +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