Thomas Gelf 57caacb93f Merge branch 'feature/fanzzzy-5481' into feature/master-1 ... 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		2014-03-04 09:42:25 +00:00
..
icingacli	Merge branch 'feature/fanzzzy-5481' into feature/master-1	2014-03-04 09:42:25 +00:00
license_writer.py	Rename Icinga 2 Web to Icinga Web 2	2013-10-23 15:11:06 +02:00