From: LegendaryGuard <rootuser999@gmail.com>
Date: Sat, 12 Jun 2021 14:49:18 +0000 (+0200)
Subject: Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d120a54e47f7425b2cf08cf941838f60cbd03d5d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
---

d120a54e47f7425b2cf08cf941838f60cbd03d5d