Merge branch 'master' into quizzes
authorCharles Connell <charles@connells.org>
Wed, 12 Mar 2014 22:28:06 +0000 (18:28 -0400)
committerCharles Connell <charles@connells.org>
Wed, 12 Mar 2014 22:28:06 +0000 (18:28 -0400)
commit2700d520d0274924f86d5124318f310d6d9ad0f5
treeb805c51eb912dcd05488bd61a640c793158c76d1
parent4a666a877c867d8ecc386be05064ba006d392b4e
parent6fcd4969f90aaa51f2621bb500b78bf67c6af4d0
Merge branch 'master' into quizzes
karmaworld/apps/notes/models.py
karmaworld/templates/notes/note_detail.html
karmaworld/urls.py
reqs/common.txt