Merge branch 'master' into readme-forms

cerebral · Nov 11, 2016 · cb43540 · cb43540
2 parents 43059dd + b477404
commit cb43540
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ A state controller with its own debugger
 [https://www.cerebraljs.com/](http://www.cerebraljs.com/).
 
 ## Cerebral v2 is still a work in progress. Please head over to our cerebral v2 WIP website for more information:
-[https://cerebral.github.io/cerebral-website/](http://cerebral.github.io/cerebral-website).
+[https://cerebral.github.io/](https://cerebral.github.io/).
 
 ## Contribute
 The entire Cerebral codebase has been rewritten to encourage contributions. The code is cleaned up, commented and all code is in a "monorepo". That means you can run tests across projects and general management of the code is simplified a lot.

diff --git a/packages/cerebral/src/Controller.js b/packages/cerebral/src/Controller.js
@@ -59,7 +59,7 @@ class Controller extends EventEmitter {
 
     if (this.devtools) {
       this.devtools.init(this)
-    } else if (process.env.NODE_ENV !== 'production') {
+    } else if (process.env.NODE_ENV !== 'production' && typeof window !== 'undefined') {
       console.warn('You are not using the Cerebral devtools. It is highly recommended to use it in combination with the debugger: https://cerebral.github.io/cerebral-website/getting-real/03_devtools.html')
     }