Merge pull request #251 from takluyver/i250

Look for notebook config in nbconfig/ subdirectory
jupyter · Aug 3, 2015 · 6bd84b9 · 6bd84b9
2 parents 2f3789f + 3a9493b
commit 6bd84b9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
@@ -815,7 +815,7 @@ def init_configurables(self):
         self.config_manager = self.config_manager_class(
             parent=self,
             log=self.log,
-            config_dir=self.config_dir,
+            config_dir=os.path.join(self.config_dir, 'nbconfig'),
         )
 
     def init_logging(self):