From: Mario <zacjardine@y7mail.com>
Date: Fri, 25 Aug 2017 11:32:38 +0000 (+0000)
Subject: Merge branch 'martin-t/insta' into 'master'
X-Git-Tag: xonotic-v0.8.5~2510
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=25255db624631282c5e1765efbc9635083bdc532;p=xonotic%2Fxonotic-data.pk3dir.git

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

Disable damagetext in instagib

See merge request !463
---

25255db624631282c5e1765efbc9635083bdc532