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

..

HistoryColorGrid.php

Merge branch 'master' into bugfix/time-formatting-6778

2015-05-21 14:57:01 +02:00

InlinePie.php

Add inline pies to host and service back to multi-select views

2015-04-02 16:25:20 +02:00