Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:21:48 +0000 (12:21 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:21:48 +0000 (12:21 +0300)
1  2 
xonotic-server.cfg

Simple merge