mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-05 08:32:53 +01:00
Conflicts: htdocs/adherents/card.php htdocs/admin/translation.php htdocs/core/class/html.formfile.class.php htdocs/societe/card.php
Conflicts: htdocs/adherents/card.php htdocs/admin/translation.php htdocs/core/class/html.formfile.class.php htdocs/societe/card.php