Merge branch 'master' of github.com:FinalsClub/karmaworld
authorSeth Woodworth <seth@sethish.com>
Thu, 21 Mar 2013 21:18:56 +0000 (17:18 -0400)
committerSeth Woodworth <seth@sethish.com>
Thu, 21 Mar 2013 21:18:56 +0000 (17:18 -0400)
commit81bb408186d3dc056ebcb5811bb58570f1a4e6ec
tree12e2e3818333cb3d0f82466b8c66e98be725f059
parent9709989f06ab3038b66d288d7dbc3ecd61d8944f
parent9876e0110bf1943b234b1522ead96f52d06e75f2
Merge branch 'master' of github.com:FinalsClub/karmaworld
karmaworld/assets/css/global.css
karmaworld/templates/courses/course_list.html
karmaworld/templates/partial/add_note.html