From: Mario <mario.mario@y7mail.com>
Date: Thu, 10 Dec 2020 01:04:25 +0000 (+0000)
Subject: Merge branch 'Mario/confirm_rsync' into 'master'
X-Git-Tag: xonotic-v0.8.5~79
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3d56c28c850dfe456298965b8f50cba8bfc468a5;p=xonotic%2Fxonotic.git

Merge branch 'Mario/confirm_rsync' into 'master'

Merge branch Mario/confirm_rsync (XS merge request)

Closes #148

See merge request xonotic/xonotic!73
---

3d56c28c850dfe456298965b8f50cba8bfc468a5