diff options
author | kumavis <kumavis@users.noreply.github.com> | 2018-05-22 05:58:37 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-22 05:58:37 +0800 |
commit | 7a65c22a024c799d4a2c2fb7184f185633d5eaa8 (patch) | |
tree | a4cc398b10a0ce00cc41c4c3a86b54731d5d824c /package.json | |
parent | 59c9852999293adaeee4c036b64ca65182879e92 (diff) | |
parent | 793737f5bc22188b8c1ee154830aa7a6f0a3c04f (diff) | |
download | tangerine-wallet-browser-7a65c22a024c799d4a2c2fb7184f185633d5eaa8.tar tangerine-wallet-browser-7a65c22a024c799d4a2c2fb7184f185633d5eaa8.tar.gz tangerine-wallet-browser-7a65c22a024c799d4a2c2fb7184f185633d5eaa8.tar.bz2 tangerine-wallet-browser-7a65c22a024c799d4a2c2fb7184f185633d5eaa8.tar.lz tangerine-wallet-browser-7a65c22a024c799d4a2c2fb7184f185633d5eaa8.tar.xz tangerine-wallet-browser-7a65c22a024c799d4a2c2fb7184f185633d5eaa8.tar.zst tangerine-wallet-browser-7a65c22a024c799d4a2c2fb7184f185633d5eaa8.zip |
Merge branch 'develop' into ci-publish-release
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index 19d3d40f1..9e4950734 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "test:integration:build": "gulp build:scss", "test:e2e:chrome": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:chrome'", "test:e2e:firefox": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:firefox'", - "test:e2e:run:chrome": "SELENIUM_BROWSER=chrome mocha test/e2e/chrome/metamask.spec --bail --recursive", - "test:e2e:run:firefox": "SELENIUM_BROWSER=firefox mocha test/e2e/firefox/metamask.spec --bail --recursive", + "test:e2e:run:chrome": "SELENIUM_BROWSER=chrome mocha test/e2e/metamask.spec --bail --recursive", + "test:e2e:run:firefox": "SELENIUM_BROWSER=firefox mocha test/e2e/metamask.spec --bail --recursive", "test:screens": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:screens:run'", "test:screens:run": "node test/screens/new-ui.js", "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload", @@ -95,7 +95,7 @@ "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-infura": "^3.0.0", - "eth-keyring-controller": "^2.2.0", + "eth-keyring-controller": "^3.1.1", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", @@ -111,7 +111,7 @@ "ethjs-query": "^0.3.4", "express": "^4.15.5", "extension-link-enabler": "^1.0.0", - "extensionizer": "^1.0.0", + "extensionizer": "^1.0.1", "fast-json-patch": "^2.0.4", "fast-levenshtein": "^2.0.6", "file-loader": "^1.1.11", |