From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 30 Jan 2018 16:04:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0'
X-Git-Tag: 3.1.0_RC_3~33
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=de7481915a02d2307efbc32e97f511a7331bcc8a;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
#	com.woltlab.wcf/page.xml
---

de7481915a02d2307efbc32e97f511a7331bcc8a
diff --cc com.woltlab.wcf/page.xml
index 7486a32dad,e1c04f77b0..545401d465
--- a/com.woltlab.wcf/page.xml
+++ b/com.woltlab.wcf/page.xml
@@@ -149,8 -143,6 +149,7 @@@
  			<controller>wcf\form\LoginForm</controller>
  			<name language="de">Anmeldung</name>
  			<name language="en">Login</name>
- 			<parent>com.woltlab.wcf.AccountManagement</parent>
 +			<excludeFromLandingPage>1</excludeFromLandingPage>
  			
  			<content language="en">
  				<title>Login</title>