From: Mario <mario.mario@y7mail.com>
Date: Tue, 14 Jul 2020 07:56:35 +0000 (+1000)
Subject: Merge branch 'master' into Mario/gametypes
X-Git-Tag: xonotic-v0.8.5~855^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be255d5426e17de0dc4beb8c423e780ebd9e617b;p=xonotic%2Fxonotic-data.pk3dir.git

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

be255d5426e17de0dc4beb8c423e780ebd9e617b