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
..
IniEditor.php	Move INI writer classes to the File namespace	2014-10-31 10:54:53 +01:00
IniWriter.php	Merge branch 'master' into feature/setup-wizard-7163	2014-11-11 09:44:11 +01:00