]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e69be6 e99f2d9)
Merge branch 'Mario/tos' into 'master'
authorAnt Zucaro <azucaro@gmail.com>
Thu, 17 Dec 2020 15:56:34 +0000 (15:56 +0000)
committerAnt Zucaro <azucaro@gmail.com>
Thu, 17 Dec 2020 15:56:34 +0000 (15:56 +0000)
Merge branch Mario/tos (XXS merge request)

See merge request xonotic/xonotic!76


Trivial merge