Merge branch 'master' into martin-t/AMMO
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 2 Sep 2019 21:15:35 +0000 (23:15 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 2 Sep 2019 21:15:35 +0000 (23:15 +0200)
1  2 
xonotic-server.cfg

Simple merge