From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 8 Mar 2018 13:26:09 +0000 (+0100)
Subject: Merge branch '3.0'
X-Git-Tag: 3.1.1~17
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=53307cb24700d8b3eeace09694ac9536bcc2499e;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '3.0'
---

53307cb24700d8b3eeace09694ac9536bcc2499e