Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
authorAlexander Ebert <ebert@woltlab.com>
Mon, 6 Nov 2017 13:05:25 +0000 (14:05 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 6 Nov 2017 13:05:25 +0000 (14:05 +0100)
commit2c5747c5aad5b4f030870870abf3b0860ffae6d9
tree82afaa3359ad50a02f90249df2209ab0a5e219a8
parentbd84152974b18baf4c846024d19bc7b402a49787
parentb9f36b27b5a46fbc817737fb456b43c072b70441
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0

# Conflicts:
# wcfsetup/install/files/lib/page/AttachmentPage.class.php
com.woltlab.wcf/option.xml
wcfsetup/install/files/lib/page/AttachmentPage.class.php