From: Spike29 <leguen.yannick@gmail.com>
Date: Tue, 7 Mar 2023 14:55:09 +0000 (+0100)
Subject: Merge branch 'master' into pending-release
X-Git-Tag: xonotic-v0.8.6~22^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=19bb18b8701c907609169876f483635830ce5cd7;p=xonotic%2Fxonotic-maps.pk3dir.git

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

19bb18b8701c907609169876f483635830ce5cd7