open_ended_module.py
25.8 KB
-
Merge branch 'master' into feature/diana/close-oe-problems · f3fa4380
Conflicts: common/lib/xmodule/xmodule/tests/test_combined_open_ended.py common/lib/xmodule/xmodule/tests/test_self_assessment.py common/lib/xmodule/xmodule/timeparse.py
Diana Huang committed