From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 9 Dec 2020 09:22:16 +0000 (+0100)
Subject: Merge branch 'master' into mfa-meta
X-Git-Tag: 5.4.0_Alpha_1~555^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=34a6cf98a2751e21c236bc296d99f73361ea118d;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into mfa-meta

For #3764.
---

34a6cf98a2751e21c236bc296d99f73361ea118d