mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-03-19 16:43:57 +01:00
Conflicts: htdocs/core/class/html.formfile.class.php htdocs/modulebuilder/template/admin/setup.php
Conflicts: htdocs/core/class/html.formfile.class.php htdocs/modulebuilder/template/admin/setup.php