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

Conflicts:
	htdocs/compta/facture.php

2017-05-17 15:20:17 +02:00

..

cron_run_jobs.php

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

2017-05-17 15:20:17 +02:00