Eric Lippmann c5804eebb7 Merge branch 'bugfix/sort-hosts-and-services-by-last-state-change-9957' ... fixes #9957		2015-12-21 10:34:20 +01:00
..
clicommands	Merge branch 'master' into feature/monitoring-restrictions-9009	2015-06-16 17:12:51 +02:00
controllers	Move sort services by last state change up in the sort by list	2015-12-21 10:33:21 +01:00
forms	Remove ConfigForm::getValues() overrides where subform values are extracted manually	2015-11-26 15:40:10 +01:00
locale	Correct spelling of acknowledgment	2015-11-26 12:29:17 +01:00
views	Merge branch 'bugfix/line-breaks-in-comments-10603'	2015-12-21 09:39:12 +01:00