From: Spike29 <leguen.yannick@gmail.com>
Date: Tue, 17 Jan 2023 18:20:40 +0000 (+0100)
Subject: Merge branch 'master' into pending-release
X-Git-Tag: xonotic-v0.8.6~22^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=82376dbf75d1892ac330718e9c0cdf2fda35da06;p=xonotic%2Fxonotic-maps.pk3dir.git

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

82376dbf75d1892ac330718e9c0cdf2fda35da06