Merge branch '6.0'
authorAlexander Ebert <ebert@woltlab.com>
Fri, 4 Oct 2024 10:55:06 +0000 (12:55 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 4 Oct 2024 10:55:06 +0000 (12:55 +0200)

Trivial merge