From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Fri, 1 Jul 2022 00:04:17 +0000 (+0200)
Subject: Merge branch 'master' into Juhu/strafehud-fixes
X-Git-Tag: xonotic-v0.8.6~136^2~36
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=82eab61e91cd09590e6bc414b0d4f769e6e0af3c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Juhu/strafehud-fixes
---

82eab61e91cd09590e6bc414b0d4f769e6e0af3c