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)
commit883e2b54db7e05149fcd5d4cfcf40ebd7181b29e
tree0a8c8a6caf5c281db36da3fa11ca77042c80911b
parent24cfab10eec8f3d8b99a8f1f19e8405539f1cb15
parent3fad83a820c9efc1d1f2a14b67056ce7a912f037
Merge branch 'northivanastan/documentation' into 'master'

Update the documentation and replace faq.html with a Markdown copy of the website FAQ

Closes #220

See merge request xonotic/xonotic!38