From: terencehill <piuntn@gmail.com>
Date: Fri, 22 Apr 2022 20:19:39 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: xonotic-v0.8.5~7^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38c57ce8802154381af2434a97c67493bcda84db;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into develop
---

38c57ce8802154381af2434a97c67493bcda84db