Merge branch '6.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 21 Sep 2023 12:02:01 +0000 (14:02 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 21 Sep 2023 12:02:01 +0000 (14:02 +0200)

Trivial merge