Merge branch 'martin-t/ok-config' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 18 Aug 2019 10:06:19 +0000 (10:06 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 18 Aug 2019 10:06:19 +0000 (10:06 +0000)
commit1a372e06c983260b7dbecd6af83f5af78bb945e7
tree1461dfd8ab60ddde3d41a390325873c14f25e715
parent34bfadeb47130d9fa0dddec0319648cd86d9afe5
parentff958ce0ab588b5ca218b037a51f509c5168a9b0
Merge branch 'martin-t/ok-config' into 'master'

Overkill config

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