From: Rudolf Polzer <divVerent@gmail.com>
Date: Thu, 8 Jul 2021 19:24:09 +0000 (+0200)
Subject: Merge branch 'master' of gitlab.com:xonotic/xonotic
X-Git-Tag: xonotic-v0.8.5~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5620c8e8930c0fdfd332872a9bcc68187c672566;p=xonotic%2Fxonotic.git

Merge branch 'master' of gitlab.com:xonotic/xonotic
---

5620c8e8930c0fdfd332872a9bcc68187c672566