content.coffee
14.9 KB
-
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance · 7c22a39a
Conflicts: common/lib/xmodule/xmodule/discussion_module.py lms/djangoapps/django_comment_client/forum/views.py lms/templates/discussion/_thread.html lms/urls.py
Mike Chen committed