]> git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46e8449 78668e1)
Merge branch 'master' into approved
authorJan Behrens <zykure@web.de>
Fri, 11 Jan 2013 16:39:54 +0000 (17:39 +0100)
committerJan Behrens <zykure@web.de>
Fri, 11 Jan 2013 16:39:54 +0000 (17:39 +0100)
Conflicts:
xonstat/__init__.py
xonstat/templates/player_game_index.mako
xonstat/views/__init__.py
xonstat/views/helpers.py
xonstat/views/player.py


Trivial merge