module_render.py
32.2 KB
-
Merge remote-tracking branch 'edx/master' into ok-merge-from-master · 6225f4d0
Conflicts: lms/djangoapps/courseware/module_render.py
Calen Pennington committed
Conflicts: lms/djangoapps/courseware/module_render.py