mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-03-07 02:55:47 +01:00
Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/lib/member.lib.php htdocs/expedition/card.php
Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/lib/member.lib.php htdocs/expedition/card.php