From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Sat, 10 Jun 2023 05:24:00 +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=e22063812208107517a70b91395597b10986b2cc;p=xonotic%2Fxonotic-data.pk3dir.git

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

e22063812208107517a70b91395597b10986b2cc