x_module.py
26.7 KB
-
Merge remote-tracking branch 'origin/master' into arjun/javascript_response · 79aab61a
Conflicts: common/lib/xmodule/xmodule/js/src/capa/display.coffee common/lib/xmodule/xmodule/tests/__init__.py common/lib/xmodule/xmodule/x_module.py lms/djangoapps/courseware/module_render.py
Calen Pennington committed