Laurent Destailleur 74f3b98ea9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php		2021-09-01 17:54:21 +02:00
..
index.html
pdf_canelle.modules.php