]> de.git.xonotic.org Git - xonotic/xonstat.git/commit - xonstat/views/submission.py
Merge branch 'master' into zykure/wip
authorJan Behrens <zykure@web.de>
Wed, 8 Jan 2014 18:08:05 +0000 (19:08 +0100)
committerJan Behrens <zykure@web.de>
Wed, 8 Jan 2014 18:08:05 +0000 (19:08 +0100)
commit5f80cb7090f4221ba5213f301bf1be9b1fbaa040
tree38c4a69daa93d7a6fb6092f0c48e9b5c667d2e47
parent06896cc168deb4e5daa39c85d11f5b065fbaf390
parent59e19b1f3e06294a73354ab413502a85ed7ad964
Merge branch 'master' into zykure/wip

Conflicts:
xonstat/__init__.py
xonstat/views/player.py
xonstat/__init__.py
xonstat/views/player.py