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

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

c9d9d189a506cb14203309f19cd9db6c6f9c06c4