]> de.git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86a5e10 4d45a11)
Fix merge conflict. allow-ranking 6/head
authorAnt Zucaro <azucaro@gmail.com>
Sun, 17 Sep 2017 15:27:39 +0000 (11:27 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Sun, 17 Sep 2017 15:27:39 +0000 (11:27 -0400)

Trivial merge