From: Mario <mario.mario@y7mail.com>
Date: Sun, 5 Apr 2020 17:38:26 +0000 (+0000)
Subject: Merge branch 'martin-t/testing-balance' into 'master'
X-Git-Tag: xonotic-v0.8.5~1132
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e73e4bd4706f18bb2de0f52fa8beed6ee0e770ce;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/testing-balance' into 'master'

Granular testing balance using votes

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

e73e4bd4706f18bb2de0f52fa8beed6ee0e770ce