From: LegendaryGuard <rootuser999@gmail.com>
Date: Thu, 7 Jul 2022 22:59:42 +0000 (+0000)
Subject: Merge branch 'Mario/weapon_alias_fix' into 'master'
X-Git-Tag: xonotic-v0.8.6~425
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ef1ca2543a39a330f6c619ee3e8707efd7252563;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/weapon_alias_fix' into 'master'

Merge branch Mario/weapon_alias_fix (XS merge request)

Closes #2714

See merge request xonotic/xonotic-data.pk3dir!1052
---

ef1ca2543a39a330f6c619ee3e8707efd7252563