]> 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>
Fri, 10 Feb 2017 00:22:34 +0000 (01:22 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 10 Feb 2017 00:22:34 +0000 (01:22 +0100)
commitb1f037f2bf1accea3caf1ec75aec01c01175f25b
tree30bcf9679b71903de066a21e95270e1d62f3a3a2
parent6fd5a60e20ca759a82b20641f76afed151379ee5
parent156fffb41f19815c94a9fe5be576587cd5de849a
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki