]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
Merge branch 'master' into martin-t/example-config
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 26 Sep 2019 13:35:31 +0000 (15:35 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 26 Sep 2019 13:35:31 +0000 (15:35 +0200)
1  2 
server/server.cfg

Simple merge