From: Mario <mario.mario@y7mail.com>
Date: Sun, 20 Dec 2020 14:31:48 +0000 (+0000)
Subject: Merge branch 'tos-updates' into 'master'
X-Git-Tag: xonotic-v0.8.5~76
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=96d01ed3454660d5e582a210fee001f218ac1882;p=xonotic%2Fxonotic.git

Merge branch 'tos-updates' into 'master'

TOS updates

See merge request xonotic/xonotic!77
---

96d01ed3454660d5e582a210fee001f218ac1882