Merge branch 'master' into terencehill/lms_updates 808/head
authorterencehill <piuntn@gmail.com>
Wed, 6 Jul 2022 13:28:34 +0000 (15:28 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 6 Jul 2022 13:28:34 +0000 (15:28 +0200)
commit8738750fed941e32330bc7d92bf0847e0fff02c2
tree49d871330ae878cfc920ea36bba508c390d76605
parenta5c08448d4f2bb86610e9fa6bde5c7bb9023e12d
parent256ba81a03f67e5d14af36e36b2d1dcc58cee70a
Merge branch 'master' into terencehill/lms_updates

# Conflicts:
# gamemodes-server.cfg
# notifications.cfg
# qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
# qcsrc/common/notifications/all.inc
gamemodes-server.cfg
notifications.cfg
qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
qcsrc/common/notifications/all.inc