Merge branch 'master' of https://github.com/WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 7 Sep 2020 13:26:13 +0000 (15:26 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 7 Sep 2020 13:26:13 +0000 (15:26 +0200)

Trivial merge