Merge branch 'master' of https://github.com/WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 23 Jun 2020 09:22:08 +0000 (11:22 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 23 Jun 2020 09:22:08 +0000 (11:22 +0200)

Trivial merge