test_access.py
5.04 KB
-
Merge branch 'master' into feature/deena/testing · 2436d59e
Conflicts: cms/djangoapps/contentstore/tests/factories.py lms/djangoapps/courseware/tests/test_access.py
Will Daly committed
Conflicts: cms/djangoapps/contentstore/tests/factories.py lms/djangoapps/courseware/tests/test_access.py