From: Mario <mario.mario@y7mail.com>
Date: Thu, 16 Jul 2020 12:40:48 +0000 (+1000)
Subject: Merge branch 'master' into Mario/q3compat_sanity
X-Git-Tag: xonotic-v0.8.6~328^2~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=02780fb9caead37e8d82121aa8612d1245700e4d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/q3compat_sanity
---

02780fb9caead37e8d82121aa8612d1245700e4d