Merge branch 'terencehill/assault_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 8 Feb 2018 00:21:35 +0000 (00:21 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 8 Feb 2018 00:21:35 +0000 (00:21 +0000)
Assault fix

Closes #1944

See merge request xonotic/xonotic-data.pk3dir!523

1  2 
qcsrc/server/client.qc
qcsrc/server/command/vote.qc
qcsrc/server/weapons/weaponsystem.qc

Simple merge
Simple merge
Simple merge