mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-07 10:08:27 +01:00
Conflicts: htdocs/core/tpl/card_presend.tpl.php htdocs/multicurrency/class/multicurrency.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php