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

Merge branch 'Mario/rocket_wall_fix' into 'master'

Merge branch Mario/rocket_wall_fix (XS merge request)

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

c691bc84cae9e9623a74b74e9e8bb5085102634f