From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 8 Apr 2020 01:10:38 +0000 (+0000)
Subject: Merge branch 'bones_was_here/gitignorewebsite' into 'master'
X-Git-Tag: xonotic-v0.8.5~95
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9825dc306e695cfce639887ce878d9554eb74fd7;p=xonotic%2Fxonotic.git

Merge branch 'bones_was_here/gitignorewebsite' into 'master'

Avoid untracked files issues when having xonotic.org repo enabled

See merge request xonotic/xonotic!65
---

9825dc306e695cfce639887ce878d9554eb74fd7