mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-04-08 17:15:08 +02:00
Conflicts: config/config.ini.in library/Icinga/Application/ApplicationBootstrap.php library/Icinga/Application/Cli.php library/Icinga/Application/EmbeddedWeb.php library/Icinga/Application/Logger.php library/Icinga/Application/Modules/Manager.php library/Icinga/Application/Web.php library/Icinga/Authentication/Backend/DbUserBackend.php library/Icinga/Authentication/Manager.php library/Icinga/User/Preferences/IniStore.php test/php/library/Icinga/Application/LoggerTest.php