From: Mario <mario.mario@y7mail.com>
Date: Fri, 18 Jun 2021 11:12:13 +0000 (+1000)
Subject: Merge branch 'master' into Mario/q3compat_sanity
X-Git-Tag: xonotic-v0.8.6~328^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4da0b1d48eaa7e046fed22cba4709dea8dd5616e;p=xonotic%2Fxonotic-data.pk3dir.git

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

4da0b1d48eaa7e046fed22cba4709dea8dd5616e