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
..
Instance	monitoring: Rename label of the path to the local Icinga command file	2014-10-28 13:52:10 +01:00
BackendConfigForm.php	Backend/Config: Add shortlink to resource	2014-11-07 14:20:47 +01:00
InstanceConfigForm.php	monitoring: Write transport directive to instances INI configuration	2014-10-29 13:36:09 +01:00
SecurityConfigForm.php	Make it optional to define protected custom variables	2014-11-07 15:05:08 +01:00