Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into rebase-juniper-updated
Browse files Browse the repository at this point in the history
# 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
shafqatfarhan committed Mar 8, 2021
2 parents 5ccf29e + b355979 commit 7425c1f
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ This is the core repository of the Open edX software. It includes the LMS
(student-facing, delivering courseware), and Studio (course authoring)
components.

Notice: This repo will be archived in April 2021.
#######

Installation
------------

Expand Down

0 comments on commit 7425c1f

Please sign in to comment.