From: terencehill <piuntn@gmail.com>
Date: Sun, 5 Mar 2023 18:35:33 +0000 (+0000)
Subject: Merge branch 'drjaska/mayhem' into 'master'
X-Git-Tag: xonotic-v0.8.6~158
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68186ff77704f9d1b5f9dc00cdf48983ba59370a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/mayhem' into 'master'

Mayhem and Team Mayhem gamemodes

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

68186ff77704f9d1b5f9dc00cdf48983ba59370a