open_ended_notifications.py
7.75 KB
-
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui · 9211a383
Conflicts: common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
Vik Paruchuri committed
Conflicts: common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py