test_module_render.py
17.4 KB
-
Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static · 0d938d39
Conflicts: lms/djangoapps/courseware/tests/test_module_render.py
ichuang committed
Conflicts: lms/djangoapps/courseware/tests/test_module_render.py