From: Martin Taibr <taibr.martin@gmail.com>
Date: Tue, 13 Aug 2019 19:16:11 +0000 (+0000)
Subject: Merge branch 'Mario/balance_configs' into 'master'
X-Git-Tag: xonotic-v0.8.5~1393
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0ba71dc570e81c28d76967aa31aff3138a713559;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/balance_configs' into 'master'

Merge branch Mario/balance_configs (S merge request)

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

0ba71dc570e81c28d76967aa31aff3138a713559