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
..
helpers	Add createTicketLinks() view helper	2015-08-03 10:39:42 +02:00
scripts	User: Use $query->hasResult() instead of $query->count()	2015-08-03 16:28:43 +02:00