Merge branch 'master' of github.com:FinalsClub/karmaworld
authorCharles Holbrow <charlesholbrow@gmail.com>
Thu, 21 Mar 2013 21:34:14 +0000 (17:34 -0400)
committerCharles Holbrow <charlesholbrow@gmail.com>
Thu, 21 Mar 2013 21:34:14 +0000 (17:34 -0400)
commit51094162e892368dbe28f67379dac2c012d67f78
tree80c92d8793e6dfbf76eccb424692d31ea9c19eea
parente2d95045a13d029e37988ee6f2c2198850490b93
parent81bb408186d3dc056ebcb5811bb58570f1a4e6ec
Merge branch 'master' of github.com:FinalsClub/karmaworld
karmaworld/assets/css/global.css
karmaworld/templates/partial/add_note.html