From: Mario <mario.mario@y7mail.com>
Date: Sun, 6 Dec 2020 11:08:23 +0000 (+0000)
Subject: Merge branch 'Mario/ghost_botname_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~649
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fbd14504426f7f8ce515827885157bc14d8172fa;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/ghost_botname_fix' into 'master'

Merge branch Mario/ghost_botname_fix (XXS merge request)

Closes #1824

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

fbd14504426f7f8ce515827885157bc14d8172fa