Laurent Destailleur 82d878dd7a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ...

Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php

2021-09-01 17:59:07 +02:00

..

index.html

…

pdf_canelle.modules.php

…