Eric Lippmann 2ad2127ae3 Merge branch 'master' into feature/generate-webserver-config-6120 ... Conflicts: application/clicommands/SetupCommand.php		2014-11-13 12:50:55 +01: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-11-12 17:05:13 +01:00
setup	Merge branch 'master' into feature/generate-webserver-config-6120	2014-11-13 12:50:55 +01:00
test	Merge branch 'master' into feature/setup-wizard-7163	2014-11-12 10:08:28 +01:00
translation	Add support for "core" modules and make the setup module such a module	2014-11-10 17:34:49 +01:00