cms/djangoapps/contentstore · 78ec7d25e2a99a2deaa2b27fb414f8b9d8d475a0 · edx / edx-platform

Merge commit '' into edx-west/rc · 280c3ebd

Conflicts:
	cms/djangoapps/contentstore/views/component.py
	lms/djangoapps/courseware/tabs.py
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/course_navigation.html
	lms/templates/courseware/courseware.html
	lms/templates/navigation.html
	lms/templates/problem.html
	requirements/edx/github.txt

committed Mar 30, 2014

280c3ebd

Name	Last commit	Last update
..
features		Loading commit data...
management		Loading commit data...
tests		Loading commit data...
views		Loading commit data...
__init__.py		Loading commit data...
context_processors.py		Loading commit data...
course_info_model.py		Loading commit data...
debug_file_uploader.py		Loading commit data...
git_export_utils.py		Loading commit data...
utils.py		Loading commit data...