From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 7 Sep 2017 12:01:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0'
X-Git-Tag: 3.1.0_Alpha_3~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dbe78d073eae99d31aa0dd98ca1df51a9d6ce15b;p=GitHub%2FWoltLab%2FWCF.git

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

# Conflicts:
#	wcfsetup/install/files/js/3rdParty/redactor2/redactor.min.js
---

dbe78d073eae99d31aa0dd98ca1df51a9d6ce15b