Johannes Meyer d1917ad2b4 Merge branch 'master' into bugfix/do-not-use-count-queries-for-emptiness-checks-9632 ...

Conflicts:
	modules/monitoring/application/views/scripts/service/history.phtml

2015-08-03 16:46:27 +02:00

..

history.phtml

Merge branch 'master' into bugfix/do-not-use-count-queries-for-emptiness-checks-9632

2015-08-03 16:46:27 +02:00

show.phtml

monitoring/details: more styling

2015-06-18 17:20:51 +02:00