From: Mario <mario.mario@y7mail.com>
Date: Fri, 15 Nov 2019 11:49:51 +0000 (+0000)
Subject: Merge branch 'terencehill/insta-lms' into 'master'
X-Git-Tag: xonotic-v0.8.5~1225
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ee04e6d274e849289298a7e3b0fb5c28c803a0d2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/insta-lms' into 'master'

Make so that Instagib overrides starting ammo/armor/health values of other gamemodes; it fixes #2337

Closes #2337

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

ee04e6d274e849289298a7e3b0fb5c28c803a0d2