Johannes Meyer 9f127be1dc Merge branch 'master' into feature/setup-wizard-7163 ... Conflicts: application/forms/Config/General/LoggingConfigForm.php		2014-10-17 13:04:59 +02:00
..
doc	Doc/IcingaWebController: Fix "The ... with non-compound name ... has no effect"	2014-09-04 14:53:00 +02:00
monitoring	Merge branch 'master' into feature/setup-wizard-7163	2014-10-17 13:04:59 +02:00
test	Remove missed echo instruction for debug purposes	2014-06-30 14:06:11 +02:00
translation	Update module/translation documentation	2014-09-16 16:26:09 +02:00