From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Tue, 28 Aug 2018 16:11:44 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Alpha_1~364^2~58
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5037f56722c7b32fcc35b9c00ae1c0e18ca8d070;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

5037f56722c7b32fcc35b9c00ae1c0e18ca8d070