Merge branch 'master' into terencehill/lms_updates

author terencehill <piuntn@gmail.com>

Wed, 17 Nov 2021 12:04:45 +0000 (13:04 +0100)

committer terencehill <piuntn@gmail.com>

Wed, 17 Nov 2021 12:04:45 +0000 (13:04 +0100)
author terencehill <piuntn@gmail.com>
Wed, 17 Nov 2021 12:04:45 +0000 (13:04 +0100)
committer terencehill <piuntn@gmail.com>
Wed, 17 Nov 2021 12:04:45 +0000 (13:04 +0100)
diff --cc qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Wed, 17 Nov 2021 12:04:45 +0000 (13:04 +0100)
committer	terencehill <piuntn@gmail.com>
	Wed, 17 Nov 2021 12:04:45 +0000 (13:04 +0100)