Merge branch 'master' into terencehill/lms_updates
authorterencehill <piuntn@gmail.com>
Thu, 17 Jun 2021 12:18:15 +0000 (14:18 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 17 Jun 2021 12:18:15 +0000 (14:18 +0200)
commit4e21f418ad9e6287efb942c1fa2861a51981110a
tree73190a018f1aead494da279840a3556da6a714eb
parent2109167b6ebf070d1797ac92a3f5f3a42578127e
parentaecd4e7b9523204a1dec88eaee0fd618976baf85
Merge branch 'master' into terencehill/lms_updates

# Conflicts:
# qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
gamemodes-server.cfg
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
qcsrc/common/mutators/mutator/waypoints/all.inc