mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-22 04:44:36 +01:00
Conflicts: htdocs/core/class/html.formfile.class.php htdocs/filefunc.inc.php htdocs/holiday/class/holiday.class.php
Conflicts: htdocs/core/class/html.formfile.class.php htdocs/filefunc.inc.php htdocs/holiday/class/holiday.class.php