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	Don't let a long plugin output make the whole container horizontally scrollable	2015-05-20 13:48:51 +02:00
font	Add new spin an cw icon for refresh control	2015-02-23 17:01:38 +01:00
img	Use an icon with better interpolation in our header bar	2014-09-04 17:41:48 +02:00
js	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
error_norewrite.html	Webserver\Apache2: show hint with no mod_rewrite	2014-11-11 22:02:40 +01:00
index.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