course_navigation.html
1.46 KB
-
Merge branch 'master' of github.com:MITx/mitx into merge · 0ae68e73
Conflicts: lms/djangoapps/courseware/views.py lms/templates/course_navigation.html
Rocky Duan committed
Conflicts: lms/djangoapps/courseware/views.py lms/templates/course_navigation.html