Merge branch '6.0' into 6.1
authorMarcel Werk <burntime@woltlab.com>
Tue, 31 Dec 2024 12:32:52 +0000 (13:32 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 31 Dec 2024 12:32:52 +0000 (13:32 +0100)

Trivial merge