From: Charles Connell <charles@connells.org>
Date: Mon, 24 Feb 2014 20:16:18 +0000 (-0500)
Subject: Merge branch 'master' into quizzes
X-Git-Tag: release-20150131~148^2^2~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c1d13952d3170fe024f1525a0d2fb9a52896826a;p=oweals%2Fkarmaworld.git

Merge branch 'master' into quizzes

Conflicts:
	karmaworld/urls.py
---

c1d13952d3170fe024f1525a0d2fb9a52896826a
diff --cc karmaworld/urls.py
index 769f3f9,6777de8..56f6ed2
--- a/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@@ -17,10 -17,8 +17,9 @@@ from karmaworld.apps.courses.views impo
  from karmaworld.apps.courses.views import school_course_instructor_list
  from karmaworld.apps.notes.views import NoteView, thank_note, NoteSearchView, flag_note, downloaded_note, edit_note_tags
  from karmaworld.apps.notes.views import RawNoteDetailView
- from karmaworld.apps.notes.views import PDFView
  from karmaworld.apps.moderation import moderator
  from karmaworld.apps.document_upload.views import save_fp_upload
 +from karmaworld.apps.quizzes.views import QuizView, KeywordEditView
  from karmaworld.apps.users.views import ProfileView
  
  # See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf