mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-17 23:11:29 +01:00
Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/translate.class.php
Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/translate.class.php