Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 10 Aug 2017 10:10:37 +0000 (12:10 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 10 Aug 2017 10:10:37 +0000 (12:10 +0200)
commita77b1f881ef01cd0fe59d34716d3d0b5f264777e
tree168e897694bd443d39a55ce234a8a4b202405bb1
parent9d2bd076d4878ee3d0bbd1749156039d8f0637e2
parent2504174662517346ac64c9e0dd3c172b3ba9f4c3
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# wcfsetup/install/files/js/WCF.User.js
wcfsetup/install/files/js/WCF.User.js