]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 341b4c1 0d209ad)
Merge branch 'Mario/ghost_botname_fix' into 'master'
authorMario <mario.mario@y7mail.com>
Sun, 6 Dec 2020 11:08:23 +0000 (11:08 +0000)
committerMario <mario.mario@y7mail.com>
Sun, 6 Dec 2020 11:08:23 +0000 (11:08 +0000)
Merge branch Mario/ghost_botname_fix (XXS merge request)

Closes #1824

See merge request xonotic/xonotic-data.pk3dir!862


Trivial merge