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

author Nikolay S <nick@teichisma.info>

Sat, 20 Jul 2024 08:40:39 +0000 (10:40 +0200)

committer Nikolay S <nick@teichisma.info>

Sat, 20 Jul 2024 08:40:39 +0000 (10:40 +0200)
author Nikolay S <nick@teichisma.info>
Sat, 20 Jul 2024 08:40:39 +0000 (10:40 +0200)
committer Nikolay S <nick@teichisma.info>
Sat, 20 Jul 2024 08:40:39 +0000 (10:40 +0200)
diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge
author	Nikolay S <nick@teichisma.info>
	Sat, 20 Jul 2024 08:40:39 +0000 (10:40 +0200)
committer	Nikolay S <nick@teichisma.info>
	Sat, 20 Jul 2024 08:40:39 +0000 (10:40 +0200)