test_enrollment.py
11.4 KB
-
Merge branch 'master' into jnater/courseware_tests · 3c67e275
Conflicts: lms/djangoapps/courseware/tests/tests.py lms/djangoapps/instructor/tests/test_enrollment.py
Jean Manuel Nater committed
Conflicts: lms/djangoapps/courseware/tests/tests.py lms/djangoapps/instructor/tests/test_enrollment.py