Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
authorAlexander Ebert <ebert@woltlab.com>
Mon, 5 Feb 2018 13:25:28 +0000 (14:25 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 5 Feb 2018 13:25:28 +0000 (14:25 +0100)
commit82c1b6df3b564518cd4e5a93611420bebb53a6c2
tree37c4b6b6ecb8807365f49b48cfa9981b0b34f15f
parentccdd48f5cf023effb5ba57a79f1a5a646e20bf4a
parent4f20ff5369f5e1cec59597b35147b6c65a98941c
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0

# Conflicts:
# wcfsetup/install/files/lib/acp/page/IndexPage.class.php
wcfsetup/install/files/acp/templates/index.tpl
wcfsetup/install/files/lib/acp/page/IndexPage.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml