Merge branch '6.0' into 6.1
authorMarcel Werk <burntime@woltlab.com>
Mon, 1 Jul 2024 11:18:01 +0000 (13:18 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 1 Jul 2024 11:18:01 +0000 (13:18 +0200)

Trivial merge