From: LegendaryGuard <rootuser999@gmail.com>
Date: Sat, 2 Jul 2022 09:34:12 +0000 (+0000)
Subject: Merge branch 'Mario/pokenade_crash_fix' into 'master'
X-Git-Tag: xonotic-v0.8.6~438
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2f3d8bd6db089867619944460cb82d17ab6a2398;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/pokenade_crash_fix' into 'master'

Merge branch Mario/pokenade_crash_fix (XS merge request)

Closes #2703

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

2f3d8bd6db089867619944460cb82d17ab6a2398