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)
# Conflicts:
# qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc

1  2 
gamemodes-server.cfg
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
qcsrc/common/mutators/mutator/waypoints/all.inc

Simple merge