mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-27 03:03:19 +01:00
Conflicts: htdocs/contact/class/contact.class.php htdocs/margin/agentMargins.php htdocs/margin/tabs/productMargins.php
Conflicts: htdocs/contact/class/contact.class.php htdocs/margin/agentMargins.php htdocs/margin/tabs/productMargins.php