common/djangoapps/student/tests · a247bb7b9e813ffc06166b46c0460bc223ccc430 · edx / edx-platform

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master · 19acdd31

Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html

committed May 12, 2014

19acdd31

Name	Last commit	Last update
..
email		Loading commit data...
__init__.py		Loading commit data...
factories.py		Loading commit data...
test_authz.py		Loading commit data...
test_auto_auth.py		Loading commit data...
test_bulk_email_settings.py		Loading commit data...
test_change_name.py		Loading commit data...
test_create_account.py		Loading commit data...
test_email.py		Loading commit data...
test_login.py		Loading commit data...
test_long_username_email.py		Loading commit data...
test_password_history.py		Loading commit data...
test_password_policy.py		Loading commit data...
test_reset_password.py		Loading commit data...
test_roles.py		Loading commit data...
test_userstanding.py		Loading commit data...
tests.py		Loading commit data...