Merged master into Lyberta/GivePlayerAmmo.
authorLyberta <lyberta@lyberta.net>
Sat, 26 Aug 2017 18:24:14 +0000 (21:24 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 26 Aug 2017 18:24:14 +0000 (21:24 +0300)
1  2 
qcsrc/server/client.qc

Simple merge