Merge branch 'master' into Mario/weaponarena_available
authorMario <mario@smbclan.net>
Sun, 11 Aug 2019 11:32:33 +0000 (21:32 +1000)
committerMario <mario@smbclan.net>
Sun, 11 Aug 2019 11:32:33 +0000 (21:32 +1000)
1  2 
qcsrc/server/miscfunctions.qc
xonotic-server.cfg

Simple merge
Simple merge