course_module.py
29 KB
-
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 8a9ba79d
Conflicts: cms/djangoapps/contentstore/views.py common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py common/lib/xmodule/xmodule/peer_grading_module.py
Calen Pennington committed