Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 4 May 2017 16:42:46 +0000 (18:42 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 4 May 2017 16:42:46 +0000 (18:42 +0200)
commit8c5a678269d2228fe22ec17c95dfebb268d658cb
treeb65c74bc63facfc743f0f5cc45a89d94a8f133fc
parent28bf084c617ae30504211c29b5df637492d2579d
parente6cc829034b66abb692216e86324a08a9abecd0a
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# wcfsetup/install/files/js/WoltLabSuite.Core.min.js