From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 9 Mar 2018 17:23:08 +0000 (+0100)
Subject: Merge branch '2.1' into 3.0
X-Git-Tag: 3.0.13~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=767f9e85a3a37b75cb3ba8430ea44cdf3d6530ff;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.1' into 3.0
---

767f9e85a3a37b75cb3ba8430ea44cdf3d6530ff