problem-edit.html
3.48 KB
-
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · f616aecd
Conflicts: common/lib/xmodule/xmodule/js/src/problem/edit.coffee
cahrens committed
Conflicts: common/lib/xmodule/xmodule/js/src/problem/edit.coffee