From: Martin Taibr <taibr.martin@gmail.com>
Date: Thu, 28 Jun 2018 02:38:38 +0000 (+0000)
Subject: Merge branch 'northivanastan/documentation' into 'master'
X-Git-Tag: xonotic-v0.8.5~155
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=883e2b54db7e05149fcd5d4cfcf40ebd7181b29e;ds=sidebyside

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
---

883e2b54db7e05149fcd5d4cfcf40ebd7181b29e