From: Mario <zacjardine@y7mail.com>
Date: Sat, 22 Sep 2018 04:50:48 +0000 (+0000)
Subject: Merge branch 'terencehill/scoreboard_stuff' into 'master'
X-Git-Tag: xonotic-v0.8.5~1841
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c72d8802ab6a8df4072e8342a5fe8750619c5855;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/scoreboard_stuff' into 'master'

Scoreboard stuff

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

c72d8802ab6a8df4072e8342a5fe8750619c5855