Merge remote-tracking branch 'origin/master' into morosophos/server-current4

author Nick S <nick@teichisma.info>

Mon, 17 Apr 2023 19:19:48 +0000 (22:19 +0300)

committer Nick S <nick@teichisma.info>

Mon, 17 Apr 2023 19:19:48 +0000 (22:19 +0300)
author Nick S <nick@teichisma.info>
Mon, 17 Apr 2023 19:19:48 +0000 (22:19 +0300)
committer Nick S <nick@teichisma.info>
Mon, 17 Apr 2023 19:19:48 +0000 (22:19 +0300)
diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge
author	Nick S <nick@teichisma.info>
	Mon, 17 Apr 2023 19:19:48 +0000 (22:19 +0300)
committer	Nick S <nick@teichisma.info>
	Mon, 17 Apr 2023 19:19:48 +0000 (22:19 +0300)