]> de.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: 7530a8f 8f0ab1d)
Merge remote-tracking branch 'origin/master' into morosophos/rankings_cnt
authorNick Savchenko <nsavch@gmail.com>
Mon, 4 Jun 2018 20:57:17 +0000 (23:57 +0300)
committerNick Savchenko <nsavch@gmail.com>
Mon, 4 Jun 2018 20:57:17 +0000 (23:57 +0300)

Trivial merge