mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-01 14:42:32 +01:00
Conflicts: htdocs/core/lib/ajax.lib.php htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php
Conflicts: htdocs/core/lib/ajax.lib.php htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php