From: Mario <mario.mario@y7mail.com>
Date: Fri, 6 Nov 2020 16:27:07 +0000 (+0000)
Subject: Merge branch 'Mario/arc_bolt_bounce' into 'master'
X-Git-Tag: xonotic-v0.8.5~686
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99aa0611469fd96b2fa2251cee35bb6cfffce713;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/arc_bolt_bounce' into 'master'

Merge branch Mario/arc_bolt_bounce (S merge request)

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

99aa0611469fd96b2fa2251cee35bb6cfffce713