Merge remote-tracking branch 'origin/6.0' into 6.0
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 18 Sep 2023 13:09:10 +0000 (15:09 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 18 Sep 2023 13:09:10 +0000 (15:09 +0200)

Trivial merge