| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| main_settings_view.js | ||
| settings_grading_view.js |
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding Conflicts: cms/djangoapps/contentstore/views.py cms/static/js/views/settings/main_settings_view.js cms/templates/index.html cms/templates/settings.html
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| main_settings_view.js | Loading commit data... | |
| settings_grading_view.js | Loading commit data... |