status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pull from master, conflict fix

This commit is contained in:
Mikhail Mikheev 2019-12-09 16:22:18 +04:00
parent 8382907b80 c2b2ccd14f
commit 75cc009896
2 changed files with 42 additions and 701 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -72,7 +72,8 @@
"reselect": "^4.0.0", "reselect": "^4.0.0",
"squarelink": "^1.1.3", "squarelink": "^1.1.3",
"web3": "1.2.4", "web3": "1.2.4",
"web3connect": "^1.0.0-beta.23" "web3connect": "^1.0.0-beta.23",
"react-ga": "^2.7.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/cli": "7.7.5", "@babel/cli": "7.7.5",

740
yarn.lock
View File

File diff suppressed because it is too large Load Diff