From: Charles Holbrow <charlesholbrow@gmail.com>
Date: Thu, 18 Apr 2013 17:08:23 +0000 (-0400)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~447^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f5ab35546054af3b2a5c8b9b22a95944209aaa60;p=oweals%2Fkarmaworld.git

Merge branch 'master' of github.com:FinalsClub/karmaworld
---

f5ab35546054af3b2a5c8b9b22a95944209aaa60
diff --cc karmaworld/urls.py
index c085e28,5587cb2..cde1cd4
--- a/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@@ -11,10 -11,10 +11,10 @@@ from karmaworld.apps.ajaxuploader.view
  from karmaworld.apps.courses.models import Course
  from karmaworld.apps.courses.views import AboutView
  from karmaworld.apps.courses.views import CourseDetailView
- from karmaworld.apps.courses.views import CourseSaveView
+ from karmaworld.apps.courses.views import CourseListView
  from karmaworld.apps.courses.views import school_list
  from karmaworld.apps.notes.views import NoteView
 -from karmaworld.apps.notes.views import raw_file
 +from karmaworld.apps.notes.views import RawNoteDetailView
  
  # See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf
  admin.autodiscover()