lms/djangoapps/dashboard · 19acdd31e851d5bf6fa54804b0c3f61f2be33760 · 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
..
management		Loading commit data...
tests		Loading commit data...
__init__.py		Loading commit data...
git_import.py		Loading commit data...
models.py		Loading commit data...
sysadmin.py		Loading commit data...
sysadmin_urls.py		Loading commit data...
views.py		Loading commit data...