tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
icingaweb2/config/modules/monitoring
History
Eric Lippmann 07d04628cf Merge branch 'feature/installation-and-configuration-cleanup-5638' 
Conflicts:
	config/config.ini.in
	library/Icinga/Application/ApplicationBootstrap.php
	library/Icinga/Application/Cli.php
	library/Icinga/Application/EmbeddedWeb.php
	library/Icinga/Application/Logger.php
	library/Icinga/Application/Modules/Manager.php
	library/Icinga/Application/Web.php
	library/Icinga/Authentication/Backend/DbUserBackend.php
	library/Icinga/Authentication/Manager.php
	library/Icinga/User/Preferences/IniStore.php
	test/php/library/Icinga/Application/LoggerTest.php
 		2014-03-03 19:03:39 +01:00
..
backends.ini.in Fix backend configuration while installation 2013-10-22 17:50:21 +02:00
instances.ini.in Review installation, create tarball and add first spec file draft. 2013-10-22 10:57:15 +02:00
menu.ini Merge branch 'feature/installation-and-configuration-cleanup-5638' 2014-03-03 19:03:39 +01:00
menu.ini.in Menu Configuration 2014-01-28 13:34:57 +01:00