Calen Pennington 19acdd31e8 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

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

2014-05-12 11:35:03 -04:00

..

models

Convert tabs to RESTful URL.

2013-11-21 10:19:43 -05:00

utils

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

video

BLD-1000: Download handout.

2014-04-22 21:44:36 +03:00

views

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

2014-05-12 11:35:03 -04:00