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