Merge branch 'pending-release' into Mario/team_keepaway

author Mario <mario.mario@y7mail.com>

Sat, 26 Nov 2022 14:11:19 +0000 (00:11 +1000)

committer Mario <mario.mario@y7mail.com>

Sat, 26 Nov 2022 14:11:19 +0000 (00:11 +1000)
author Mario <mario.mario@y7mail.com>
Sat, 26 Nov 2022 14:11:19 +0000 (00:11 +1000)
committer Mario <mario.mario@y7mail.com>
Sat, 26 Nov 2022 14:11:19 +0000 (00:11 +1000)
diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge
author	Mario <mario.mario@y7mail.com>
	Sat, 26 Nov 2022 14:11:19 +0000 (00:11 +1000)
committer	Mario <mario.mario@y7mail.com>
	Sat, 26 Nov 2022 14:11:19 +0000 (00:11 +1000)