From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 15 Aug 2022 14:05:29 +0000 (+0200)
Subject: Merge branch 'master' into master-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c928e000281714672f6b891894537bab4aa98f3d;p=xonotic%2Fnetradiant.git

Merge branch 'master' into master-merge
---

c928e000281714672f6b891894537bab4aa98f3d