x_module.py
46.4 KB
-
Merge remote-tracking branch 'origin/master' into release, conflicts resolved · bdfd81d2
Conflicts: cms/envs/common.py common/lib/xmodule/xmodule/seq_module.py lms/envs/common.py requirements/edx/edx-private.txt
Han Su Kim committed