Merge branch 'master' into Mario/movetype_push
authorMario <mario.mario@y7mail.com>
Fri, 10 Jul 2020 10:07:36 +0000 (20:07 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 10 Jul 2020 10:07:36 +0000 (20:07 +1000)
1  2 
qcsrc/server/g_world.qc

Simple merge