Eric Lippmann 11a006681b Merge branch 'master' into bugfix/monitoring-remove-services-tab-7998 ...

Conflicts:
	application/controllers/ConfigController.php
	library/Icinga/Web/Widget/FilterEditor.php
	modules/monitoring/application/controllers/HostsController.php

2015-06-05 15:27:42 +02:00

..

doc

Merge the menu entries for users, groups and roles into "Authentication"

2015-06-01 17:16:24 +02:00

monitoring

Merge branch 'master' into bugfix/monitoring-remove-services-tab-7998

2015-06-05 15:27:42 +02:00

setup

ConfigController: We're configuring user backends from now on

2015-06-02 09:58:57 +02:00

test

Fix some spelling errors in comments and messages

2015-03-08 15:32:22 +01:00

translation

Fix some spelling errors in comments and messages

2015-03-08 15:32:22 +01:00