mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-06 17:48:25 +01:00
Conflicts: htdocs/admin/dict.php htdocs/compta/cashcontrol/cashcontrol_list.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/modulebuilder/index.php htdocs/modulebuilder/template/myobject_list.php htdocs/product/class/api_products.class.php