Merge branch 'master' into DefaultUser/kick_teamkiller
authorMario <mario@smbclan.net>
Sat, 25 Nov 2017 06:37:25 +0000 (16:37 +1000)
committerMario <mario@smbclan.net>
Sat, 25 Nov 2017 06:37:25 +0000 (16:37 +1000)
# Conflicts:
# mutators.cfg

1  2 
mutators.cfg
qcsrc/common/mutators/mutator/_mod.inc
qcsrc/common/mutators/mutator/_mod.qh
qcsrc/server/defs.qh

diff --cc mutators.cfg
Simple merge
Simple merge
Simple merge