Conflicts: application/controllers/AuthenticationController.php application/controllers/ErrorController.php application/views/scripts/authentication/login.phtml library/Icinga/Application/ApplicationBootstrap.php library/Icinga/Web/Controller/ActionController.php library/Icinga/Web/Hook.php library/Icinga/Web/Widget/Dashboard.php |
||
---|---|---|
.. | ||
ConfigAwareFactory.php | ||
DateTimeFactory.php | ||
Dimension.php | ||
File.php | ||
Format.php | ||
String.php | ||
Translator.php |