open_ended_image_submission.py
8.38 KB
-
Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images · a0febd35
Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py
Vik Paruchuri committed
Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py