From: Mario <zacjardine@y7mail.com>
Date: Wed, 7 Mar 2018 08:26:35 +0000 (+0000)
Subject: Merge branch 'martin-t/example-config' into 'master'
X-Git-Tag: xonotic-v0.8.5~180
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cf5382f782b4b43adf2cf1a22bff4eb1af5f086c;p=xonotic%2Fxonotic.git

Merge branch 'martin-t/example-config' into 'master'

Example config changes

See merge request xonotic/xonotic!35
---

cf5382f782b4b43adf2cf1a22bff4eb1af5f086c