common/djangoapps/student · 18c91d0f1d8bfd7e278c8c094e6f5fbdb85290c4 · edx / edx-platform

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master · 18c91d0f

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

committed May 16, 2014

18c91d0f

Name	Last commit	Last update
..
management		Loading commit data...
migrations		Loading commit data...
tests		Loading commit data...
__init__.py		Loading commit data...
admin.py		Loading commit data...
auth.py		Loading commit data...
firebase_token_generator.py		Loading commit data...
forms.py		Loading commit data...
middleware.py		Loading commit data...
models.py		Loading commit data...
roles.py		Loading commit data...
views.py		Loading commit data...