From: Mario <zacjardine@y7mail.com>
Date: Mon, 12 Aug 2019 10:54:26 +0000 (+0000)
Subject: Merge branch 'marin-t/fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~1401
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c060a62c1f112d8f449388dffcb2ca9ddf027692;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'marin-t/fix' into 'master'

Fix for hash change

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

c060a62c1f112d8f449388dffcb2ca9ddf027692