From: Mario <mario.mario@y7mail.com>
Date: Fri, 6 Nov 2020 15:19:36 +0000 (+0000)
Subject: Merge branch 'Mario/glowy_skins' into 'develop'
X-Git-Tag: xonotic-v0.8.5~7^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1c3b3ad614c53bdcd67ad8c966eb8bec7675de7e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/glowy_skins' into 'develop'

Merge branch Mario/glowy_skins (XS merge request)

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

1c3b3ad614c53bdcd67ad8c966eb8bec7675de7e