From: terencehill <piuntn@gmail.com>
Date: Mon, 24 May 2021 10:58:22 +0000 (+0000)
Subject: Merge branch 'terencehill/freezetag_updates' into 'master'
X-Git-Tag: xonotic-v0.8.5~405^2~32
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=bde37f2d51cfe8a6a4bfafe64efcc749442aed1b

Merge branch 'terencehill/freezetag_updates' into 'master'

Freezetag updates

See merge request xonotic/xonotic-data.pk3dir!896
---

bde37f2d51cfe8a6a4bfafe64efcc749442aed1b