views.py
10.7 KB
-
Merge branch 'discussion2' of github.com:dementrock/mitx · e705bbb7
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