Eric Lippmann 54577d04bd Merge branch 'master' into bugfix/time-formatting-6778 ... Conflicts: modules/monitoring/application/views/scripts/list/comments.phtml modules/monitoring/application/views/scripts/list/hostgroups.phtml modules/monitoring/application/views/scripts/process/info.phtml modules/monitoring/application/views/scripts/show/components/downtime.phtml modules/monitoring/application/views/scripts/show/components/notifications.phtml modules/monitoring/public/css/module.less		2015-05-21 14:57:01 +02:00
..
components	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
contact.phtml	show/contact: Ensure dashboard compliance	2015-04-17 16:10:49 +02:00
history.phtml	Revert "Require `host_name' instead of `host' to show or list particular objects"	2015-04-20 16:11:22 +02:00
services.phtml	Host detail view: Fix that the list of services is missing all tabs	2015-04-20 14:56:30 +02:00