Calen Pennington cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html

2014-05-22 10:52:00 -04:00

..

en_us

Merge remote-tracking branch 'edx/master' into opaque-keys

2014-05-22 10:52:00 -04:00

shared

Add mock package to RTD requirements

2013-09-12 10:56:47 -04:00

__init__.py

Switch to common structure and shared resources

2013-07-16 13:01:12 -04:00

config.ini

Added new context sensitive link and updated text

2014-05-16 20:38:09 -04:00