From: Mario <mario.mario@y7mail.com>
Date: Sat, 28 Dec 2019 13:40:52 +0000 (+0000)
Subject: Merge branch 'terencehill/campaign_balance_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~1177
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=27bc18f43e9d09ffa55bca593e48e69c2c734d15;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/campaign_balance_fix' into 'master'

Campaign balance fix

Closes #2364

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

27bc18f43e9d09ffa55bca593e48e69c2c734d15