mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-06 01:28:19 +01:00
Conflicts: htdocs/core/modules/barcode/modules_barcode.class.php htdocs/product/admin/product.php
Conflicts: htdocs/core/modules/barcode/modules_barcode.class.php htdocs/product/admin/product.php