api.py
47.6 KB
-
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master · 661f37ec
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
Calen Pennington committed