From: terencehill <piuntn@gmail.com>
Date: Wed, 18 Aug 2021 20:25:02 +0000 (+0000)
Subject: Merge branch 'Mario/electro_sticky_trail_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~363
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a62d4caad165c63856096d8d4eb0f41b0d1552a4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/electro_sticky_trail_fix' into 'master'

Merge branch Mario/electro_sticky_trail_fix (XXS merge request)

Closes #2582

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

a62d4caad165c63856096d8d4eb0f41b0d1552a4