From: Mirio <opivy@hotmail.de>
Date: Thu, 22 Feb 2018 23:13:08 +0000 (+0000)
Subject: Merge branch 'patch-1' into 'master'
X-Git-Tag: xonotic-v0.8.5~181
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=398e5df70cd2b267accdd8d761b65afb7fdfb2ea;p=xonotic%2Fxonotic.git

Merge branch 'patch-1' into 'master'

Update server.cfg (spelling)

See merge request xonotic/xonotic!37
---

398e5df70cd2b267accdd8d761b65afb7fdfb2ea