icingaweb2/library/Icinga/Authentication
Johannes Meyer 9d292269b1 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/LdapResourceForm.php
	test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
2014-11-11 09:44:11 +01:00
..
Backend Merge branch 'master' into feature/setup-wizard-7163 2014-11-11 09:44:11 +01:00
AdmissionLoader.php Use lowercase username and user groups for loading user permissions and restrictions 2014-10-20 13:36:37 +02:00
AuthChain.php Prefer Icinga\Application\Config instead of Zend_Config 2014-11-07 13:53:03 +01:00
Manager.php Merge branch 'master' into feature/setup-wizard-7163 2014-11-11 09:44:11 +01:00
UserBackend.php Merge branch 'master' into feature/setup-wizard-7163 2014-11-11 09:44:11 +01:00
UserGroupBackend.php Prefer Icinga\Application\Config instead of Zend_Config 2014-11-07 13:53:03 +01:00