mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-22 09:21:30 +01:00
Conflicts: htdocs/core/class/commonobject.class.php htdocs/product/class/product.class.php
Conflicts: htdocs/core/class/commonobject.class.php htdocs/product/class/product.class.php