From: Spike29 <leguen.yannick@gmail.com>
Date: Wed, 16 Mar 2022 21:54:17 +0000 (+0100)
Subject: Merge branch 'master' into Mirio/rush, fix merge conflicts
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7733a3481247f7c95a859c7526c04ecaa78d7a20;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into Mirio/rush, fix merge conflicts
---

7733a3481247f7c95a859c7526c04ecaa78d7a20