Laurent Destailleur 848b8f9bc4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/public/cron/cron_run_jobs.php htdocs/public/payment/newpayment.php scripts/cron/cron_run_jobs.php		2019-05-27 19:01:28 +02:00
..
cron_run_jobs.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-05-27 19:01:28 +02:00