]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bc44ce fcc2cea)
Merge branch 'Mario/confirm_rsync' into 'master'
authorMario <mario.mario@y7mail.com>
Thu, 10 Dec 2020 01:04:25 +0000 (01:04 +0000)
committerMario <mario.mario@y7mail.com>
Thu, 10 Dec 2020 01:04:25 +0000 (01:04 +0000)
Merge branch Mario/confirm_rsync (XS merge request)

Closes #148

See merge request xonotic/xonotic!73


Trivial merge