From: Mario <mario.mario@y7mail.com>
Date: Wed, 3 Jun 2020 13:00:02 +0000 (+1000)
Subject: Merge branch 'master' into Mario/headshots
X-Git-Tag: xonotic-v0.8.5~829^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=da2c4ce524f19480061740bafcfc0fceeb7ff040;p=xonotic%2Fxonotic-data.pk3dir.git

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

da2c4ce524f19480061740bafcfc0fceeb7ff040