edx-platform

Files

Calen Pennington 18c91d0f1d Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html

2014-05-16 14:01:20 -04:00

architecture

Reorganize documentation files for i18n

2014-01-16 14:11:11 -05:00

course_authors

Update Video docs to reflect new UI

2014-05-16 11:52:19 -04:00

data

Merge pull request #3722 from edx/ahodges/documentation/DOC156

2014-05-14 16:42:54 -04:00

developers

Update opaque_keys docs