Johannes Meyer a55cced039 Merge branch 'master' into feature/custom-menu-items-5600 ... Conflicts: modules/monitoring/application/views/scripts/list/comments.phtml modules/monitoring/application/views/scripts/list/downtimes.phtml		2015-09-25 14:12:43 +02:00
..
clicommands	Merge branch 'master' into feature/monitoring-restrictions-9009	2015-06-16 17:12:51 +02:00
controllers	Repair "Show More" links in the Alert Summary	2015-09-21 13:26:42 +02:00
forms	Merge branch 'master' into feature/custom-menu-items-5600	2015-09-25 14:12:43 +02:00
locale	Update locale it_IT	2015-09-01 23:02:52 +02:00
views	Merge branch 'master' into feature/custom-menu-items-5600	2015-09-25 14:12:43 +02:00