views.py
10.5 KB
-
Merge branch 'master' of github.com:MITx/mitx · 777c3ee4
Conflicts: lms/djangoapps/courseware/views.py lms/templates/profile.html
Rocky Duan committed
Conflicts: lms/djangoapps/courseware/views.py lms/templates/profile.html