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

Conflicts: cms/envs/common.py lms/envs/common.py

Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10
Conflicts: cms/envs/common.py lms/envs/common.py
31a070d4 · Calen Pennington · 08ed1c54 · 603a97fa · 31a070d4 · 31a070d4
Commit 31a070d4 authored Mar 10, 2014 by Calen Pennington
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 3 deletions

common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
+1 -2

lms/envs/common.py
+0 -1

No files found.
--- 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
\ No newline at end of file
+        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',