From: Spike29 <leguen.yannick@gmail.com>
Date: Sat, 22 Oct 2022 09:35:04 +0000 (+0200)
Subject: Merge branch 'master' into pending-release
X-Git-Tag: xonotic-v0.8.6~22^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09049b13c251087b922f4eecaf683c5784986fec;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into pending-release
---

09049b13c251087b922f4eecaf683c5784986fec