test_views.py
7.36 KB
-
Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing · d81b0316
Conflicts: lms/djangoapps/courseware/tests/test_views.py
Deena Wang committed
Conflicts: lms/djangoapps/courseware/tests/test_views.py