Merge branch '6.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 28 Sep 2023 13:36:41 +0000 (15:36 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 28 Sep 2023 13:36:41 +0000 (15:36 +0200)

Trivial merge