views.py
10.9 KB
-
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading · 4fedca5b
Conflicts: lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/views.py
Bridger Maxwell committed
Conflicts: lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/views.py