common.py
19.8 KB
-
Merge branch 'master' into jmpm-analytics · d0bff1ed
Conflicts: lms/djangoapps/instructor/views.py lms/envs/common.py lms/templates/courseware/instructor_dashboard.html
David Ormsbee committed
Conflicts: lms/djangoapps/instructor/views.py lms/envs/common.py lms/templates/courseware/instructor_dashboard.html