From: bones_was_here <bones_was_here@xonotic.au>
Date: Sun, 28 May 2023 05:32:20 +0000 (+0000)
Subject: Merge branch 'pending-release' into 'master'
X-Git-Tag: xonotic-v0.8.6~22
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e29d6384be9bd41fa0bcdaf43fda803b56e5f43d;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'pending-release' into 'master'

Merge pending-release into master

Closes #204

See merge request xonotic/xonotic-maps.pk3dir!171
---

e29d6384be9bd41fa0bcdaf43fda803b56e5f43d