From: Martin Taibr 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: https://git.rm.cloudns.org/?a=commitdiff_plain;h=883e2b54db7e05149fcd5d4cfcf40ebd7181b29e;p=xonotic%2Fxonotic.git 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