From: Mario <mario.mario@y7mail.com>
Date: Fri, 17 Jul 2020 19:10:20 +0000 (+0000)
Subject: Merge branch 'Mario/gametypes' into 'master'
X-Git-Tag: xonotic-v0.8.5~855
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c9347b663acd739a4b44c420910f371fa1d0ed5c

Merge branch 'Mario/gametypes' into 'master'

Merge branch Mario/gametypes (L merge request)

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

c9347b663acd739a4b44c420910f371fa1d0ed5c