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

Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/legacy.py

2014-05-14 15:57:38 -04:00

..

contentstore

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

2014-05-14 15:57:38 -04:00

course_creators

Replace authz fns with roles.py ones

2014-01-14 17:04:44 -05:00

models

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

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