course_module.py
10.7 KB
-
Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading · 68ab1973
Conflicts: lms/djangoapps/courseware/views.py
Bridger Maxwell committed
Conflicts: lms/djangoapps/courseware/views.py