Eric Lippmann 11e7d1050f Merge branch 'bugfix/line-breaks-in-comments-10603' ... fixes #10603		2015-12-21 09:39:12 +01:00
..
clicommands	Merge branch 'master' into feature/monitoring-restrictions-9009	2015-06-16 17:12:51 +02:00
controllers	monitoring: Fix English	2015-11-16 12:20:39 +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