Merge branch 'Mario/gametypes' into 'master'
authorMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 19:10:20 +0000 (19:10 +0000)
committerMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 19:10:20 +0000 (19:10 +0000)
commitc9347b663acd739a4b44c420910f371fa1d0ed5c
treef4fa9d6552200e25f336f999833a2a6b2086703d
parente9e8607c8d31e228d97b6de6999cd62d1dd5bcf8
parent6ca8a217c0308dddb9bfca06782f3a2baf462103
Merge branch 'Mario/gametypes' into 'master'

Merge branch Mario/gametypes (L merge request)

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