From: Spike29 <leguen.yannick@gmail.com>
Date: Mon, 5 Sep 2022 20:34:18 +0000 (+0200)
Subject: Merge branch 'master' into pending-release
X-Git-Tag: xonotic-v0.8.6~22^2~17
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=64cf991d458d919486fc77beaea4752ca8a5d980;p=xonotic%2Fxonotic-maps.pk3dir.git

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

64cf991d458d919486fc77beaea4752ca8a5d980