Merge branch 'master' of github.com:BlueWallet/BlueWallet

This commit is contained in:
Overtorment 2020-02-28 12:34:32 +00:00
commit 6e76ebc733
2 changed files with 4 additions and 4 deletions

6
package-lock.json generated
View file

@ -4447,9 +4447,9 @@
} }
}, },
"eslint-config-prettier": { "eslint-config-prettier": {
"version": "6.0.0", "version": "6.10.0",
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz",
"integrity": "sha512-vDrcCFE3+2ixNT5H83g28bO/uYAwibJxerXPj+E7op4qzBCsAV36QfvdAyVOoNxKAH2Os/e01T/2x++V0LPukA==", "integrity": "sha512-AtndijGte1rPILInUdHjvKEGbIV06NuvPrqlIEaEaWtbtvJh464mDeyGMdZEQMsGvC0ZVkiex1fSNcC4HAbRGg==",
"requires": { "requires": {
"get-stdin": "^6.0.0" "get-stdin": "^6.0.0"
} }

View file

@ -73,7 +73,7 @@
"dayjs": "1.8.14", "dayjs": "1.8.14",
"ecurve": "1.0.6", "ecurve": "1.0.6",
"electrum-client": "git+https://github.com/BlueWallet/rn-electrum-client.git", "electrum-client": "git+https://github.com/BlueWallet/rn-electrum-client.git",
"eslint-config-prettier": "6.9.0", "eslint-config-prettier": "6.10.0",
"eslint-config-standard": "12.0.0", "eslint-config-standard": "12.0.0",
"eslint-config-standard-react": "7.0.2", "eslint-config-standard-react": "7.0.2",
"eslint-plugin-prettier": "3.1.0", "eslint-plugin-prettier": "3.1.0",