Skip to content

E
edx-platform
Commit 31a070d4 by Calen Pennington
Options

Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10 

Conflicts:
	cms/envs/common.py
	lms/envs/common.py
parents 08ed1c54 603a97fa
Showing with 1 additions and 3 deletions
common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
...@@ -1655,4 +1655,4 @@ class SplitMongoModuleStore(ModuleStoreWriteBase): ...@@ -1655,4 +1655,4 @@ class SplitMongoModuleStore(ModuleStoreWriteBase):
Todo: Needs to be implemented. Todo: Needs to be implemented.
""" """
courses = [] courses = []
return courses return courses
\ No newline at end of file
lms/envs/common.py
...@@ -1465,7 +1465,6 @@ ALL_LANGUAGES = ( ...@@ -1465,7 +1465,6 @@ ALL_LANGUAGES = (
### Apps only installed in some instances ### Apps only installed in some instances
OPTIONAL_APPS = ( OPTIONAL_APPS = (
'edx_jsdraw', 'edx_jsdraw',
'mentoring', 'mentoring',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment