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