From: Mario <mario.mario@y7mail.com>
Date: Mon, 27 Jul 2020 03:22:55 +0000 (+0000)
Subject: Merge branch 'Mario/headshots' into 'master'
X-Git-Tag: xonotic-v0.8.5~829
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=59d3684c3ce95d95c6d3f14e6fc5567a2e6ff2ba;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/headshots' into 'master'

Merge branch Mario/headshots (S merge request)

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

59d3684c3ce95d95c6d3f14e6fc5567a2e6ff2ba