]> git.xonotic.org Git - xonotic/xonotic.git/commit
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)
commit4bef11dd105bae0ed398c9bc88c2dcb6d895d3d4
treedf01f7bd311ac69d3dfc1ed5a9d62d3866cdb406
parent9f46518ae07fdcda48cc95f052833b0633948733
parent7e91a2c46dee36129396d942fac174154d8ed162
Merge branch 'master' into martin-t/example-config
server/server.cfg