urls.py
8.57 KB
-
Merge branch 'master' of github.com:MITx/mitx · 8228bebc
Conflicts: lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/views.py lms/envs/common.py
Rocky Duan committed
Conflicts: lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/views.py lms/envs/common.py