Matthias Jentsch 25f397042b Merge branch 'master' into feature/improve-multi-select-view-8565 ... Conflicts: modules/monitoring/application/controllers/HostsController.php modules/monitoring/application/controllers/ServicesController.php modules/monitoring/application/views/scripts/hosts/show.phtml modules/monitoring/application/views/scripts/list/hosts.phtml modules/monitoring/application/views/scripts/partials/host/objects-header.phtml modules/monitoring/application/views/scripts/partials/service/objects-header.phtml modules/monitoring/application/views/scripts/services/show.phtml modules/monitoring/public/css/module.less public/js/icinga/behavior/tooltip.js		2015-05-11 13:28:43 +02:00
..
Backend	Merge branch 'master' into feature/improve-multi-select-view-8565	2015-05-11 13:28:43 +02:00
AdmissionLoader.php	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
AuthChain.php	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
Manager.php	Authentication\Manager: do not override user groups	2015-02-09 15:27:50 +01:00
UserBackend.php	Use (only) "@return $this" in fluent interfaces' documentation	2015-04-07 14:24:11 +02:00
UserGroupBackend.php	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00