From: Spike29 <leguen.yannick@gmail.com>
Date: Tue, 27 Dec 2022 08:59:30 +0000 (+0100)
Subject: Merge branch 'master' into pending-release
X-Git-Tag: xonotic-v0.8.6~22^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=51e893353c32142ec4f793540426ef41ed5fb133;p=xonotic%2Fxonotic-maps.pk3dir.git

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

51e893353c32142ec4f793540426ef41ed5fb133