Merge branch 'master' into terencehill/freezetag_updates
authorterencehill <piuntn@gmail.com>
Wed, 21 Apr 2021 08:39:44 +0000 (10:39 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 21 Apr 2021 08:39:44 +0000 (10:39 +0200)
commit579b98f2d87d5d2753618322ade31af1422d91ec
tree20a151427160c1b8094c1c3556fb963cf80e8703
parent2bd915e7a3ac6db896372f149638b30b1bb1d8fc
parente0362d9da6c8f7a7e94414ef735ad6095a91c0b1
Merge branch 'master' into terencehill/freezetag_updates

# Conflicts:
# qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc