Merge zykure-approved, my fixes, and merge fixes :D
authorAnt Zucaro <azucaro@gmail.com>
Fri, 19 Apr 2013 00:59:52 +0000 (20:59 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Fri, 19 Apr 2013 00:59:52 +0000 (20:59 -0400)
commit66fc4afcf0da79994ac252700177bb897ebea77d
treee623070dc032a239db7faec5fda7531a7db6eba3
parent4d8d3afb2f14b6573fbd988ea1fe9a0920e9cacf
parent9a9f9d23837618cd316d9cdf34731b30e61532dc
Merge zykure-approved, my fixes, and merge fixes :D
xonstat/models.py
xonstat/static/css/app.css
xonstat/static/css/app.min.css
xonstat/templates/main_index.mako
xonstat/templates/player_index.mako
xonstat/templates/player_info.mako