From: bones_was_here <bones_was_here@xa.org.au>
Date: Sat, 4 Jun 2022 12:43:50 +0000 (+0000)
Subject: Merge branch 'Mario/monsters' into 'develop'
X-Git-Tag: xonotic-v0.8.5~7^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=561489d21c9053b7103c6604c362aa24ee5c7916;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/monsters' into 'develop'

Merge branch Mario/monsters (L merge request)

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

561489d21c9053b7103c6604c362aa24ee5c7916