component.py
11.4 KB
-
Merge branch 'master' into feature/christina/metadata-ui · c95b44d8
Conflicts: cms/envs/common.py cms/templates/base.html common/lib/xmodule/xmodule/combined_open_ended_module.py
cahrens committed
Conflicts: cms/envs/common.py cms/templates/base.html common/lib/xmodule/xmodule/combined_open_ended_module.py