test_views.py
9.22 KB
-
Merge branch 'master' into will/use-mixed-modulestore-in-tests · 96c2a503
Conflicts: common/lib/xmodule/xmodule/modulestore/django.py lms/djangoapps/courseware/tests/test_views.py lms/djangoapps/courseware/tests/tests.py
Will Daly committed