Laurent Destailleur 6512435f9f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ...

Conflicts:
	htdocs/core/modules/cheque/doc/pdf_blochet.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php

2019-08-01 16:27:55 +02:00

..

index.html

…

pdf_blochet.class.php

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0

2019-08-01 16:27:55 +02:00