Merge remote-tracking branch 'remotes/origin/release' into...
Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts
No related branches found
No related tags found
Showing
- common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py 0 additions, 10 deletions...ib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
- common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py 0 additions, 96 deletions...odule/xmodule/modulestore/tests/test_mixed_modulestore.py
- lms/djangoapps/courseware/tests/test_module_render.py 1 addition, 1 deletionlms/djangoapps/courseware/tests/test_module_render.py
- requirements/edx/github.txt 1 addition, 1 deletionrequirements/edx/github.txt
Loading
Please register or sign in to comment