From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Wed, 21 Jun 2023 23:59:47 +0000 (+0200)
Subject: Merge branch 'Juhu/battle-royale' into Juhu/battle-royale_server
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=19a28e63b388194dfb41d343c8a91250b0dbf806;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Juhu/battle-royale' into Juhu/battle-royale_server
---

19a28e63b388194dfb41d343c8a91250b0dbf806