]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6856fc c1d872c)
Merge branch 'tos-updates' into 'master'
authorMario <mario.mario@y7mail.com>
Sun, 20 Dec 2020 14:31:48 +0000 (14:31 +0000)
committerMario <mario.mario@y7mail.com>
Sun, 20 Dec 2020 14:31:48 +0000 (14:31 +0000)
TOS updates

See merge request xonotic/xonotic!77


Trivial merge