course_metadata.py
3.58 KB
-
Merge remote-tracking branch 'origin/master' into fix/vik/add-oe-tab · 20bbf75f
Conflicts: cms/djangoapps/contentstore/utils.py cms/djangoapps/contentstore/views.py cms/djangoapps/models/settings/course_metadata.py
Vik Paruchuri committed