mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-03-11 21:06:58 +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