Merge remote-tracking branch 'origin/master'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 13 Jul 2017 12:12:45 +0000 (14:12 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 13 Jul 2017 12:12:45 +0000 (14:12 +0200)
commitb83a466425089947610aafd27dd5f2cde4fea2be
tree235e23afd06b378c663790196b377b9a5becc9a0
parentd49556513b7ae8060c6451077d2d05d6e7397b13
parentd42bf05f228b91c8d48df9136f9d391dbd6f821f
Merge remote-tracking branch 'origin/master'

# Conflicts:
# wcfsetup/install/lang/en.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml