Merge branch 'master' into pending-release

author Mario <mario.mario@y7mail.com>

Sun, 27 Nov 2022 04:37:21 +0000 (14:37 +1000)

committer Mario <mario.mario@y7mail.com>

Sun, 27 Nov 2022 04:37:21 +0000 (14:37 +1000)
author Mario <mario.mario@y7mail.com>
Sun, 27 Nov 2022 04:37:21 +0000 (14:37 +1000)
committer Mario <mario.mario@y7mail.com>
Sun, 27 Nov 2022 04:37:21 +0000 (14:37 +1000)
diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge
author	Mario <mario.mario@y7mail.com>
	Sun, 27 Nov 2022 04:37:21 +0000 (14:37 +1000)
committer	Mario <mario.mario@y7mail.com>
	Sun, 27 Nov 2022 04:37:21 +0000 (14:37 +1000)