cms/static/client_templates · 7940ca54ad02ceeda93950f93dfb7910f72b6177 · 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
..
advanced_entry.html		Loading commit data...
checklist.html		Loading commit data...
course_grade_policy.html		Loading commit data...
course_info_handouts.html		Loading commit data...
course_info_update.html		Loading commit data...
load_templates.html		Loading commit data...
metadata_editor.html		Loading commit data...
metadata_number_entry.html		Loading commit data...
metadata_option_entry.html		Loading commit data...
metadata_string_entry.html		Loading commit data...