mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-02 23:22:32 +01:00
Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/compta/paiement/card.php htdocs/expedition/class/expedition.class.php
Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/compta/paiement/card.php htdocs/expedition/class/expedition.class.php