mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-30 21:31:42 +01:00
Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/supplier_proposal/class/supplier_proposal.class.php
Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/supplier_proposal/class/supplier_proposal.class.php