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
..
Manager.php	Add support for "core" modules and make the setup module such a module	2014-11-10 17:34:49 +01:00
Module.php	Merge branch 'master' into feature/setup-wizard-7163	2014-11-11 09:44:11 +01:00