Pull from master, conflict fix

2019-12-09 16:22:18 +04:00 · 2019-12-09 16:22:18 +04:00 · 75cc009896
parent 8382907b80 c2b2ccd14f
commit 75cc009896
2 changed files with 42 additions and 701 deletions
--- a/package.json
+++ b/package.json
@ -72,7 +72,8 @@
    "reselect": "^4.0.0",
    "squarelink": "^1.1.3",
    "web3": "1.2.4",
-    "web3connect": "^1.0.0-beta.23"
+    "web3connect": "^1.0.0-beta.23",
+    "react-ga": "^2.7.0"
  },
  "devDependencies": {
    "@babel/cli": "7.7.5",
--- a/yarn.lock
+++ b/yarn.lock