test_views.py
21.4 KB
-
Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing · 1a6fc1b5
Conflicts: cms/djangoapps/contentstore/tests/test_views.py
Deena Wang committed
Conflicts: cms/djangoapps/contentstore/tests/test_views.py