From: Mario <mario.mario@y7mail.com>
Date: Mon, 18 May 2020 09:47:06 +0000 (+0000)
Subject: Merge branch 'garymoon/show-server-name-in-info' into 'master'
X-Git-Tag: xonotic-v0.8.5~1068
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=002be87cfe10ccbfedaf09eec48a1c78b10f8476;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'garymoon/show-server-name-in-info' into 'master'

Display server hostname in welcome message and info

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

002be87cfe10ccbfedaf09eec48a1c78b10f8476