From: Ant Zucaro <azucaro@gmail.com>
Date: Thu, 17 Dec 2020 15:56:34 +0000 (+0000)
Subject: Merge branch 'Mario/tos' into 'master'
X-Git-Tag: xonotic-v0.8.5~77
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d6856fccad9abe7b0f7223343d0c37dd56d3d9e6;p=xonotic%2Fxonotic.git

Merge branch 'Mario/tos' into 'master'

Merge branch Mario/tos (XXS merge request)

See merge request xonotic/xonotic!76
---

d6856fccad9abe7b0f7223343d0c37dd56d3d9e6