Merge branch 'master' of https://github.com/WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 7 Aug 2020 20:53:30 +0000 (22:53 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 7 Aug 2020 20:53:30 +0000 (22:53 +0200)

Trivial merge