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

..

application

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

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

doc

Documentation: Add config overview as first draft

2015-06-01 19:16:35 +02:00

library/Monitoring

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

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

public

Merge branch 'master' into bugfix/time-formatting-6778

2015-05-21 14:57:01 +02:00

test/php

Fix MacroTest

2015-05-28 16:08:21 +02:00

configuration.php

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

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

module.info

monitoring/module.info: provide sample metadata

2014-05-26 14:35:59 +00:00