Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorMarcel Werk <burntime@woltlab.com>
Tue, 30 Jan 2018 16:04:37 +0000 (17:04 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 30 Jan 2018 16:04:37 +0000 (17:04 +0100)
# Conflicts:
# com.woltlab.wcf/page.xml

1  2 
com.woltlab.wcf/page.xml

index 7486a32dad115fe19660f97eafe45b3ab6bd0e29,e1c04f77b066aa73d35b0754a6870741d453f305..545401d465fcf2eed9dbc2502d9260c5d0320d23
                        <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>