From: Spike29 <leguen.yannick@gmail.com>
Date: Sun, 21 May 2023 12:13:05 +0000 (+0200)
Subject: Merge branch 'master' into pending-release
X-Git-Tag: xonotic-v0.8.6~22^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8c07fc56b2d0cd0512bb16c95c2fe99c18b9ff24;p=xonotic%2Fxonotic-maps.pk3dir.git

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

8c07fc56b2d0cd0512bb16c95c2fe99c18b9ff24