cms/static/js/models · 4a64c0c9b6839628989f11a0584981ac7f9c54b0 · edx / edx-platform · GitLab

History Find file

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

committed May 23, 2013

Name	Last commit	Last update
..
settings		Loading commit data...
checklists.js		Loading commit data...
course_info.js		Loading commit data...
course_relative.js		Loading commit data...
feedback.js		Loading commit data...
metadata_model.js		Loading commit data...
module_info.js		Loading commit data...
section.js		Loading commit data...