urls.py
11.4 KB
-
Merge branch 'master' of github.com:MITx/mitx into refactor · 8684ae29
Conflicts: lms/djangoapps/courseware/views.py lms/templates/courseware/courseware.html requirements.txt
Rocky Duan committed
Conflicts: lms/djangoapps/courseware/views.py lms/templates/courseware/courseware.html requirements.txt