course_navigation.html
1.73 KB
-
Merge branch 'master' of github.com:MITx/mitx into merge · eb47093b
Conflicts: common/djangoapps/student/models.py lms/djangoapps/courseware/views.py lms/templates/course_navigation.html
Rocky Duan committed
Conflicts: common/djangoapps/student/models.py lms/djangoapps/courseware/views.py lms/templates/course_navigation.html