From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Wed, 17 Mar 2021 23:48:34 +0000 (+0100)
Subject: Merge branch 'master' into Juhu/strafehud-fixes
X-Git-Tag: xonotic-v0.8.6~136^2~65
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6a501068766094b93c1d14663caf4895f2e9c446;p=xonotic%2Fxonotic-data.pk3dir.git

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

6a501068766094b93c1d14663caf4895f2e9c446