From: Mario <mario.mario@y7mail.com>
Date: Wed, 28 Aug 2019 17:15:48 +0000 (+0000)
Subject: Merge branch 'martin-t/blaster' into 'master'
X-Git-Tag: xonotic-v0.8.5~1359
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99262bf5759010457a3331ec08e985c3924a2b3f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/blaster' into 'master'

Restore blaster push

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

99262bf5759010457a3331ec08e985c3924a2b3f