Merge branch '6.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 5 Oct 2023 15:37:08 +0000 (17:37 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 5 Oct 2023 15:37:08 +0000 (17:37 +0200)

Trivial merge