mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-07 09:32:47 +01:00
Conflicts: htdocs/adherents/card.php htdocs/core/class/html.formother.class.php htdocs/core/modules/societe/doc/doc_generic_odt.modules.php htdocs/projet/tasks/time.php htdocs/webservices/server_thirdparty.php