Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 26 Feb 2018 11:34:18 +0000 (12:34 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 26 Feb 2018 11:34:18 +0000 (12:34 +0100)
commitac144cb0219993c822581fbe3a234b13dd162c56
treedc542c78dfcfe17a150d8e68fa8c5b325404efb6
parentb28e5d902637da77590a4e8438f55f5592619b0c
parent1d2f2b1c36b0bf0ccb2d00008147a9eabd1c173b
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# wcfsetup/install/files/lib/acp/form/PageAddForm.class.php
wcfsetup/install/files/lib/acp/form/PageAddForm.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml