From: Mario <mario.mario@y7mail.com>
Date: Fri, 6 Nov 2020 13:55:39 +0000 (+0000)
Subject: Merge branch 'Mario/matchcount' into 'develop'
X-Git-Tag: xonotic-v0.8.5~7^2~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1ea9a8bdfd765f9ccec511cb673db43674777aa7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/matchcount' into 'develop'

Merge branch Mario/matchcount (XXS merge request)

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

1ea9a8bdfd765f9ccec511cb673db43674777aa7