Merge branch 'master' into Lyberta/TeamplayOverhaul2
authorLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:32:08 +0000 (13:32 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:32:08 +0000 (13:32 +0300)
1  2 
xonotic-server.cfg

Simple merge