Merge branch 'master' into feat/v6_1b_branding

Cryptonomic · Dec 18, 2018 · 6e021df · 6e021df
2 parents d6212ef + ab73e9a
commit 6e021df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/config.json b/app/config.json
@@ -1,8 +1,8 @@
 {
   "name": "Tezori",
   "version": "0.6.1b",
-  "network": "zeronet",
-  "blockExplorerHost": "http://zeronet.tzscan.io/",
+  "network": "mainnet",
+  "blockExplorerHost": "http://tzscan.io/",
   "logo": "tezosLogo.svg",
   "icon": "tezos",
   "termsService": "https://github.com/Cryptonomic/Tezori",

diff --git a/app/package.json b/app/package.json
@@ -16,7 +16,7 @@
   "license": "MIT",
   "dependencies": {
     "@ledgerhq/hw-transport-node-hid": "^4.24.0",
-    "conseiljs": "https://a944a75da6e29dc79252b34830eb28ea8b0dbe8b:x-oauth-basic@github.com/Cryptonomic/ConseilJS.git#staging",
+    "conseiljs": "https://a944a75da6e29dc79252b34830eb28ea8b0dbe8b:x-oauth-basic@github.com/Cryptonomic/ConseilJS.git#master",
     "react-currency-input": "^1.3.6"
   }
 }