From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Sat, 20 Jun 2020 14:35:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into Juhu/strafehud
X-Git-Tag: xonotic-v0.8.5~738^2~60
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=38f4a1731d66faca35562977b145f76e119f2887

Merge remote-tracking branch 'origin/master' into Juhu/strafehud
---

38f4a1731d66faca35562977b145f76e119f2887