From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Fri, 7 Aug 2020 15:48:41 +0000 (+0200)
Subject: Merge branch 'master' into Juhu/strafehud
X-Git-Tag: xonotic-v0.8.5~738^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ae488fa94396ad9ffa0dc3dbfbedb54c8b7983a;p=xonotic%2Fxonotic-data.pk3dir.git

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

6ae488fa94396ad9ffa0dc3dbfbedb54c8b7983a