Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 1 Mar 2017 11:16:07 +0000 (12:16 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 1 Mar 2017 11:16:07 +0000 (12:16 +0100)
commitf3d30931aff110f1ac7fa25e697ff2048017889c
treef342bc3ea0b0722fd55ecb4b27c4ff6d0d33c77d
parent99f6c08749099f513ee2231046365337d627a35c
parentdd6858282d8bd86006b9ab28235bff2414cdbfa4
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# com.woltlab.wcf/package.xml
# wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/lang/de.xml