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
..
css	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
js	Timeline: Do not enable infinite scrolling when shown in the dashboard	2015-04-20 13:25:29 +02:00