]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9e6e89 06510c2)
Merge branch 'nyov/wiki' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 08:34:30 +0000 (08:34 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 08:34:30 +0000 (08:34 +0000)
gitignore new wiki repo

I'm sorry I forgot this in the original commit.

See merge request !5


Trivial merge