]> git.xonotic.org Git - xonotic/xonstat.git/commit
Merge branch 'master' into pickupbot
authorJan D. Behrens <zykure@web.de>
Fri, 28 Sep 2012 20:20:00 +0000 (22:20 +0200)
committerJan D. Behrens <zykure@web.de>
Fri, 28 Sep 2012 20:20:00 +0000 (22:20 +0200)
commitfb97c6a0fd21b56f463da8b922ff22685b558673
tree66f7ab0058cb0ea8bf6463e8cc638b2482838c45
parent5bd11c0a91d8d1e0829f3c31ab1e20ea12b0ac56
parent0001da172bbfa102abbdea56a8d5617278ddcb94
Merge branch 'master' into pickupbot

Conflicts:
xonstat/views/player.py