]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
Merge branch 'master' into martin-t/example-config
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 23 Feb 2018 22:26:32 +0000 (23:26 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 23 Feb 2018 22:26:32 +0000 (23:26 +0100)
1  2 
server/server.cfg

Simple merge