Merge branch '5.5' into 6.0
authorMarcel Werk <burntime@woltlab.com>
Thu, 30 Nov 2023 17:04:41 +0000 (18:04 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 30 Nov 2023 17:04:41 +0000 (18:04 +0100)

Trivial merge