From: Mario <mario.mario@y7mail.com>
Date: Sat, 11 Jul 2020 14:18:32 +0000 (+0000)
Subject: Merge branch 'Mario/movetype_push' into 'master'
X-Git-Tag: xonotic-v0.8.5~881
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c1b079f2971aac5b48b4e0a37d21c50eab5e2021;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/movetype_push' into 'master'

Merge branch Mario/movetype_push (S merge request)

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

c1b079f2971aac5b48b4e0a37d21c50eab5e2021