Merge branch 'master' into pending-release

author drjaska <drjaska83@gmail.com>

Thu, 30 Mar 2023 22:28:55 +0000 (01:28 +0300)

committer drjaska <drjaska83@gmail.com>

Thu, 30 Mar 2023 22:28:55 +0000 (01:28 +0300)
author drjaska <drjaska83@gmail.com>
Thu, 30 Mar 2023 22:28:55 +0000 (01:28 +0300)
committer drjaska <drjaska83@gmail.com>
Thu, 30 Mar 2023 22:28:55 +0000 (01:28 +0300)
diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge
author	drjaska <drjaska83@gmail.com>
	Thu, 30 Mar 2023 22:28:55 +0000 (01:28 +0300)
committer	drjaska <drjaska83@gmail.com>
	Thu, 30 Mar 2023 22:28:55 +0000 (01:28 +0300)