Merge branch 'master' into martin-t/master2

author Martin Taibr <taibr.martin@gmail.com>

Sat, 30 Nov 2019 22:02:35 +0000 (23:02 +0100)

committer Martin Taibr <taibr.martin@gmail.com>

Sat, 30 Nov 2019 22:02:35 +0000 (23:02 +0100)
author Martin Taibr <taibr.martin@gmail.com>
Sat, 30 Nov 2019 22:02:35 +0000 (23:02 +0100)
committer Martin Taibr <taibr.martin@gmail.com>
Sat, 30 Nov 2019 22:02:35 +0000 (23:02 +0100)
diff --cc qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
Simple merge
author	Martin Taibr <taibr.martin@gmail.com>
	Sat, 30 Nov 2019 22:02:35 +0000 (23:02 +0100)
committer	Martin Taibr <taibr.martin@gmail.com>
	Sat, 30 Nov 2019 22:02:35 +0000 (23:02 +0100)