Jannis Moßhammer b045650a19 Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179 ... Conflicts: application/layouts/scripts/layout.phtml modules/monitoring/application/controllers/ListController.php modules/monitoring/application/controllers/ShowController.php modules/monitoring/application/views/scripts/list/hosts.phtml modules/monitoring/application/views/scripts/show/components/comments.phtml modules/monitoring/application/views/scripts/show/components/contacts.phtml modules/monitoring/application/views/scripts/show/components/customvars.phtml modules/monitoring/application/views/scripts/show/host.phtml modules/monitoring/library/Monitoring/Backend/AbstractBackend.php modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php		2013-07-12 15:55:31 +02:00
..
list	Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179	2013-07-12 15:55:31 +02:00
show	Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179	2013-07-12 15:55:31 +02:00
summary	Update the monitoring module	2013-07-12 14:33:17 +02:00