]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24cfab1 3fad83a)
Merge branch 'northivanastan/documentation' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 28 Jun 2018 02:38:38 +0000 (02:38 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 28 Jun 2018 02:38:38 +0000 (02:38 +0000)
Update the documentation and replace faq.html with a Markdown copy of the website FAQ

Closes #220

See merge request xonotic/xonotic!38


Trivial merge