From: Spike29 <leguen.yannick@gmail.com>
Date: Wed, 28 Aug 2024 09:58:19 +0000 (+0200)
Subject: Merge branch 'master' into pending-release, fix a merge conflict on maps/opium.mapinfo
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bcb2e2002bf7097260a3e09946566f46a6696edd;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into pending-release, fix a merge conflict on maps/opium.mapinfo
---

bcb2e2002bf7097260a3e09946566f46a6696edd