From: LegendaryGuard <rootuser999@gmail.com>
Date: Tue, 25 May 2021 21:39:48 +0000 (+0200)
Subject: Merge branch 'LegendaryGuard/armorizing_and_dark_nades' into LegendaryGuard/cyber
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=381ebc8f34ba352049a744f547de307c2a648e8b;p=xonotic%2Fxonotic-data.pk3dir.git

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

381ebc8f34ba352049a744f547de307c2a648e8b