]> git.xonotic.org Git - xonotic/xonstatdb.git/commitdiff
projects / xonotic / xonstatdb.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e635085 e07ec5c)
Merge branch 'master' of gitlab.com:xonotic/xonstatdb
authorAnt Zucaro <azucaro@gmail.com>
Sun, 18 Oct 2020 13:23:06 +0000 (09:23 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Sun, 18 Oct 2020 13:23:06 +0000 (09:23 -0400)

Trivial merge