Merge branch 'master' of github.com:FinalsClub/karmaworld
authorCharles Holbrow <charlesholbrow@gmail.com>
Thu, 18 Apr 2013 17:08:23 +0000 (13:08 -0400)
committerCharles Holbrow <charlesholbrow@gmail.com>
Thu, 18 Apr 2013 17:08:23 +0000 (13:08 -0400)
commitf5ab35546054af3b2a5c8b9b22a95944209aaa60
tree2da5c37c3e029537b9d29d80489eb4c9c941c507
parent3b4ea2c1e1b90ca6e80b78864a77156e1c59618f
parent980ce084fcebeb3184eb6c2787bd393d4bf62cb8
Merge branch 'master' of github.com:FinalsClub/karmaworld
karmaworld/assets/css/global.css
karmaworld/urls.py