From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 18 Jan 2019 16:38:50 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Alpha_1~357
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=11a3e0707b9a80f4336b8be0c07086ba033264c0;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

11a3e0707b9a80f4336b8be0c07086ba033264c0