From: Mario <zacjardine@y7mail.com>
Date: Sun, 20 Dec 2020 03:19:48 +0000 (+1000)
Subject: Merge branch 'master' into Mario/damagetext_reliable
X-Git-Tag: xonotic-v0.8.5~632^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3469a255c9f26098dc87ab42f12c8b224cae04fd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/damagetext_reliable
---

3469a255c9f26098dc87ab42f12c8b224cae04fd