Merge branch 'master' of github.com:dementrock/mitx into ccp0101/playground

Conflicts: lms/urls.py
2012-08-09 12:40:55 -04:00
parent 46a7c51df5 65f849637f
commit f7924aef08
1 changed files with 0 additions and 1 deletions
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -141,7 +141,6 @@ if settings.COURSEWARE_ENABLED:

        # discussion
        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/discussion/',
-
        include('django_comment_client.urls')),
        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/gradebook$',
            'courseware.views.gradebook'),