From: Mario <mario.mario@y7mail.com>
Date: Thu, 26 Sep 2019 10:47:09 +0000 (+0000)
Subject: Merge branch 'martin-t/ctf-autoreturn' into 'master'
X-Git-Tag: xonotic-v0.8.5~1273
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6c319c2baf6bcac5d7f57d097b7773d1f6f23294;p=xonotic%2Fxonotic-data.pk3dir.git

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

Suggest increasing ctf autoreturn

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

6c319c2baf6bcac5d7f57d097b7773d1f6f23294