This repository has been archived by the owner on Feb 26, 2024. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into rebase-juniper-updated
# Conflicts: # .circleci/config.yml # README.rst # common/lib/xmodule/xmodule/modulestore/mongo/base.py # common/lib/xmodule/xmodule/modulestore/tests/factories.py # common/lib/xmodule/xmodule/modulestore/tests/test_split_mongo_mongo_connection.py # common/lib/xmodule/xmodule/mongo_utils.py # lms/djangoapps/dashboard/git_import.py # lms/djangoapps/verify_student/tests/test_services.py # openedx/core/djangoapps/user_api/completion/tasks.py # requirements/edx/base.txt # requirements/edx/custom.txt # requirements/edx/development.txt # requirements/edx/paver.in # requirements/edx/paver.txt # requirements/edx/testing.txt
- Loading branch information