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

author bones_was_here <bones_was_here@xonotic.au>

Sun, 9 Apr 2023 07:06:31 +0000 (17:06 +1000)

committer bones_was_here <bones_was_here@xonotic.au>

Sun, 9 Apr 2023 07:06:31 +0000 (17:06 +1000)
author bones_was_here <bones_was_here@xonotic.au>
Sun, 9 Apr 2023 07:06:31 +0000 (17:06 +1000)
committer bones_was_here <bones_was_here@xonotic.au>
Sun, 9 Apr 2023 07:06:31 +0000 (17:06 +1000)
diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge
author	bones_was_here <bones_was_here@xonotic.au>
	Sun, 9 Apr 2023 07:06:31 +0000 (17:06 +1000)
committer	bones_was_here <bones_was_here@xonotic.au>
	Sun, 9 Apr 2023 07:06:31 +0000 (17:06 +1000)