mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-10-01 13:49:06 +02:00
Conflicts: application/controllers/AuthenticationController.php application/controllers/ConfigController.php application/forms/Authentication/LoginForm.php application/forms/Preference/GeneralForm.php modules/monitoring/application/controllers/ChartController.php