Laurent Destailleur ff8d22a80d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/expedition/class/expedition.class.php scripts/cron/cron_run_jobs.php		2020-05-18 15:57:01 +02:00
..
contact.class.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-05-18 15:57: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