From: terencehill <piuntn@gmail.com>
Date: Sun, 16 Oct 2022 21:07:33 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/player_sorting
X-Git-Tag: xonotic-v0.8.6~319^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d2a588188f8e5c3cdcc716ddc08d521ee26b483f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/player_sorting

# Conflicts:
#	.gitlab-ci.yml
---

d2a588188f8e5c3cdcc716ddc08d521ee26b483f