]> git.rm.cloudns.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a5cd35 688fa30)
Merge branch 'master' into zykure/wip
authorJan Behrens <zykure@web.de>
Tue, 11 Mar 2014 13:21:10 +0000 (14:21 +0100)
committerJan Behrens <zykure@web.de>
Tue, 11 Mar 2014 13:21:10 +0000 (14:21 +0100)
1  2 
xonstat/views/player.py patch | diff1 | diff2 | blob | history

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