Laurent Destailleur b87feab1e3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/commonobject.class.php		2018-02-22 12:19:20 +01:00
..
cronjob.class.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-22 12:19:20 +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