Merge branch '6.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 26 Sep 2023 09:52:55 +0000 (11:52 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 26 Sep 2023 09:52:55 +0000 (11:52 +0200)

Trivial merge