]> git.xonotic.org Git - xonotic/xonotic.git/commit
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)
commitd6856fccad9abe7b0f7223343d0c37dd56d3d9e6
tree9f7c56f0c65f0ad9ad607db3ab5f9522e87363d5
parent2e69be664033b05ca804ae014f6626f330284cd4
parente99f2d9b8aa565349aded640cb9a2f5a2ac7f5e5
Merge branch 'Mario/tos' into 'master'

Merge branch Mario/tos (XXS merge request)

See merge request xonotic/xonotic!76