From: Mario <zacjardine@y7mail.com>
Date: Sun, 18 Aug 2019 10:06:19 +0000 (+0000)
Subject: Merge branch 'martin-t/ok-config' into 'master'
X-Git-Tag: xonotic-v0.8.5~1385
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1a372e06c983260b7dbecd6af83f5af78bb945e7;p=xonotic%2Fxonotic-data.pk3dir.git

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

Overkill config

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

1a372e06c983260b7dbecd6af83f5af78bb945e7