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

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

62b78244831b7c3f6a3c5f750c8d1ec501fb74fd