courseware.html
2.22 KB
-
Merge branch 'master' of github.com:MITx/mitx into profile · 028bd23c
Conflicts: lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/views.py lms/templates/course_navigation.html
Rocky Duan committed