From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 6 May 2017 11:18:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master' into next
X-Git-Tag: 3.1.0_Alpha_1~470
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b34ad7f3fd63d79fe9ad7fd586aabb1a753675e4;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'refs/remotes/origin/master' into next

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

b34ad7f3fd63d79fe9ad7fd586aabb1a753675e4