Merge branch 'master' of github.com:standardnotes/web into ivs

2017-03-18 15:48:42 -05:00
parent c2654756ef 0294b0a093
commit bb459810f4
20 changed files with 179 additions and 130 deletions
--- a/app/assets/javascripts/app/services/syncManager.js
+++ b/app/assets/javascripts/app/services/syncManager.js
@@ -10,7 +10,7 @@ class SyncManager {
  }

  get serverURL() {
-    return localStorage.getItem("server") || "https://n3.standardnotes.org";
+    return localStorage.getItem("server") || window._default_sf_server;
  }

  get masterKey() {