views.py
8.88 KB
-
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse · fdd96636
Conflicts: common/lib/xmodule/xmodule/capa_module.py common/lib/xmodule/xmodule/modulestore/xml.py lms/djangoapps/courseware/views.py lms/templates/index.html lms/templates/info.html lms/templates/main.html lms/templates/navigation.html requirements.txt
Calen Pennington committed