-
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse · 7f3a5d02
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
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| _problems.scss | Loading commit data... |