From: terencehill <piuntn@gmail.com>
Date: Mon, 28 Jun 2021 08:53:52 +0000 (+0000)
Subject: Merge branch 'bones_was_here/fc_auto_helpme' into 'master'
X-Git-Tag: xonotic-v0.8.5~387
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ae838b73ec88a21b5a7b27937b0b1405b56e217d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'bones_was_here/fc_auto_helpme' into 'master'

Whitelist g_ctf_flagcarrier_auto_helpme_damage

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

ae838b73ec88a21b5a7b27937b0b1405b56e217d