From: Mario <mario.mario@y7mail.com>
Date: Sat, 11 Jul 2020 13:04:54 +0000 (+1000)
Subject: Merge branch 'master' into Mario/headshots
X-Git-Tag: xonotic-v0.8.5~829^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bd641d09ffc8a71a251c8c34fa21e3bf0aab39fc;p=xonotic%2Fxonotic-data.pk3dir.git

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

bd641d09ffc8a71a251c8c34fa21e3bf0aab39fc