From: Mario <zacjardine@y7mail.com>
Date: Wed, 21 Aug 2019 14:28:44 +0000 (+0000)
Subject: Merge branch 'martin-t/ctf' into 'master'
X-Git-Tag: xonotic-v0.8.5~1380
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=25c0e0a4d5c4d517947c5f8e390cc67a7aa30894;p=xonotic%2Fxonotic-data.pk3dir.git

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

Suggestion to increase autocap

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

25c0e0a4d5c4d517947c5f8e390cc67a7aa30894