main_settings_view.js
7.51 KB
-
Merge branch 'master' into feature/cas/manual-policy · f91060d1
Conflicts: cms/djangoapps/contentstore/features/common.py cms/djangoapps/contentstore/features/section.py cms/djangoapps/contentstore/tests/test_course_settings.py cms/djangoapps/contentstore/views.py cms/static/js/models/settings/course_grading_policy.js cms/static/js/views/settings/main_settings_view.js cms/static/sass/_settings.scss cms/templates/settings.html cms/urls.py
cahrens committed