Merge branch 'master' into mand1nga/update-docs
[xonotic/xonotic.git] / server / .gitattributes
1 *.txt -crlf