projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74f1aad 97fdbc5)
Merge branch 'zykure-approved'
authorAnt Zucaro <azucaro@gmail.com>
Tue, 23 Apr 2013 02:26:12 +0000 (22:26 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Tue, 23 Apr 2013 02:26:12 +0000 (22:26 -0400)
1  2 
xonstat/views/player.py patch | diff1 | diff2 | blob | history

diff --cc xonstat/views/player.py
Simple merge