From: terencehill <piuntn@gmail.com>
Date: Thu, 17 Jun 2021 12:18:15 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/lms_updates
X-Git-Tag: xonotic-v0.8.6~426^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e21f418ad9e6287efb942c1fa2861a51981110a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/lms_updates

# Conflicts:
#	qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
---

4e21f418ad9e6287efb942c1fa2861a51981110a