icingaweb2/library/Icinga/Authentication
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
..
Backend Decouple authentication backend creation from Icinga\Authentication\Manager 2014-03-03 17:21:17 +01:00
AdmissionLoader.php Decouple authentication backend creation from Icinga\Authentication\Manager 2014-03-03 17:21:17 +01:00
AuthChain.php Merge branch 'feature/installation-and-configuration-cleanup-5638' 2014-03-03 19:03:39 +01:00
Manager.php Merge branch 'feature/installation-and-configuration-cleanup-5638' 2014-03-03 19:03:39 +01:00
Membership.php Decouple authentication backend creation from Icinga\Authentication\Manager 2014-03-03 17:21:17 +01:00
UserBackend.php Decouple authentication backend creation from Icinga\Authentication\Manager 2014-03-03 17:21:17 +01:00