From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 27 Jul 2017 13:54:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0'
X-Git-Tag: 3.1.0_Alpha_1~186
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=614d35a1d7a9cca92a09fa02ab97638f55f0f04e;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'refs/remotes/origin/3.0'

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

614d35a1d7a9cca92a09fa02ab97638f55f0f04e