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
..
clicommands	CLI/monitoring/list: fix DataView-related exception	2014-07-31 17:24:56 +02:00
controllers	Merge branch 'master' into bugfix/drop-zend-config-7147	2014-11-07 14:07:15 +01:00
forms	Merge branch 'master' into feature/setup-wizard-7163	2014-11-11 09:44:11 +01:00
locale	Fix spelling mistake: Unandled -> Unhandled	2014-09-05 23:42:49 +02:00
views	Revert "Monitoring/Backens: Add resource configuration link"	2014-11-07 14:18:23 +01:00