From: terencehill <piuntn@gmail.com>
Date: Tue, 4 Jun 2024 12:55:25 +0000 (+0200)
Subject: Merge branch 'master' into pending-release
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=393b1cb248bf670e7714d3625582e8d40e666b5a;p=xonotic%2Fxonotic-data.pk3dir.git

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

393b1cb248bf670e7714d3625582e8d40e666b5a