xmodule_modifiers.py
7.74 KB
-
Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static · 220ec522
Conflicts: common/djangoapps/static_replace/__init__.py common/djangoapps/xmodule_modifiers.py lms/djangoapps/courseware/courses.py lms/djangoapps/courseware/module_render.py
ichuang committed