mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-31 14:12:29 +01:00
Conflicts: htdocs/expedition/class/expedition.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/societe/list.php
Conflicts: htdocs/expedition/class/expedition.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/societe/list.php