Laurent Destailleur 540999faa5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/lib/company.lib.php		2018-09-03 14:06:51 +02:00
..
cron_run_jobs.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-03 14:06:51 +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