Merge remote-tracking branch 'origin/master' into pending-release

author bones_was_here <bones_was_here@xonotic.au>

Tue, 9 May 2023 09:22:19 +0000 (19:22 +1000)

committer bones_was_here <bones_was_here@xonotic.au>

Tue, 9 May 2023 09:22:19 +0000 (19:22 +1000)
author bones_was_here <bones_was_here@xonotic.au>
Tue, 9 May 2023 09:22:19 +0000 (19:22 +1000)
committer bones_was_here <bones_was_here@xonotic.au>
Tue, 9 May 2023 09:22:19 +0000 (19:22 +1000)
diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge
author	bones_was_here <bones_was_here@xonotic.au>
	Tue, 9 May 2023 09:22:19 +0000 (19:22 +1000)
committer	bones_was_here <bones_was_here@xonotic.au>
	Tue, 9 May 2023 09:22:19 +0000 (19:22 +1000)