Laurent Destailleur fb8ad77378 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql

2018-04-23 23:09:53 +02:00

..

cron_run_jobs.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-04-23 23:09:53 +02:00