modulestore_config.py
968 Bytes
-
Merge branch 'release' · 47ce9082
Conflicts: common/lib/xmodule/xmodule/modulestore/mongo/draft.py lms/djangoapps/courseware/tests/modulestore_config.py
Diana Huang committed
Conflicts: common/lib/xmodule/xmodule/modulestore/mongo/draft.py lms/djangoapps/courseware/tests/modulestore_config.py