From: drjaska <drjaska83@gmail.com>
Date: Fri, 12 Nov 2021 13:03:06 +0000 (+0200)
Subject: Merge branch 'master' into drjaska/effectinfo
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=571f7d83294ce0894386c77d4e73d97389e83416;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into drjaska/effectinfo
---

571f7d83294ce0894386c77d4e73d97389e83416