]> git.xonotic.org Git - xonotic/xonotic.wiki.git/commit
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 27 Feb 2017 13:26:34 +0000 (14:26 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 27 Feb 2017 13:26:34 +0000 (14:26 +0100)
commit345c3becf8c0e3b4a784d25726f4fcf7143622d4
tree544fcaedf3e85f98b7572ae1cd39d99f007b8ebe
parent47b6cc99633e3a505e9cea44780e5cdf10f09290
parent37545cdb035e2494b78289a72bc62114b06f9a9e
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki