Merge branch '6.0'
authorMarcel Werk <burntime@woltlab.com>
Mon, 5 Aug 2024 14:23:42 +0000 (16:23 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 5 Aug 2024 14:23:42 +0000 (16:23 +0200)

Trivial merge