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 |
|
Johannes Meyer
|
7b99b74ae1
|
Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
|
2014-11-07 13:53:03 +01:00 |
|
Johannes Meyer
|
170ded6510
|
Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
library/Icinga/Authentication/Backend/LdapUserBackend.php
library/Icinga/File/Ini/IniWriter.php
|
2014-11-04 14:22:53 +01:00 |
Eric Lippmann
|
b38e3affb9
|
Move INI writer classes to the File namespace
fixes #7150
|
2014-10-31 10:54:53 +01:00 |