Bernd Erk ac8cc0613c Merge branch 'master' into feature/redesign-7144 ... Conflicts: application/views/scripts/authentication/login.phtml public/css/icinga/login.less		2014-11-12 17:21:54 +01:00
..
login.phtml	Merge branch 'master' into feature/redesign-7144	2014-11-12 17:21:54 +01:00
logout.phtml	Autologin: Fix javascript logout code	2014-07-29 11:12:15 +02:00