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

Conflicts: cms/envs/common.py lms/envs/common.py
2014-03-10 16:21:08 -04:00
parent 08ed1c5439 603a97fa79
commit 31a070d480
2 changed files with 1 additions and 2 deletions
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
@@ -1655,4 +1655,4 @@ class SplitMongoModuleStore(ModuleStoreWriteBase):
        Todo: Needs to be implemented.
        """
        courses = []
-        return courses
+        return courses
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1465,7 +1465,6 @@ ALL_LANGUAGES = (


 ### Apps only installed in some instances
-
 OPTIONAL_APPS = (
    'edx_jsdraw',
    'mentoring',