diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-11-21 06:44:28 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-11-21 06:44:28 +0800 |
| commit | 9b1df386de908ae14e0ce169f1231a0d6de77972 (patch) | |
| tree | d7fc663343b7ba3c28dff0022ca018a01bea451c /package.json | |
| parent | c0557b43e2c493de73c8bf74cfa9e5740c8cfd3f (diff) | |
| parent | 5956f8d260270d41f1e5be53f3c058782a1ae7f4 (diff) | |
| download | tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.gz tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.bz2 tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.lz tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.xz tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.zst tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.zip | |
fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/package.json b/package.json index dd7496929..b734c8328 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,8 @@ "disc": "gulp disc --debug", "announce": "node development/announcer.js", "version:bump": "node development/run-version-bump.js", - "storybook": "start-storybook -p 6006 -c .storybook" + "storybook": "start-storybook -p 6006 -c .storybook", + "update-changelog": "./auto-changelog.sh" }, "browserify": { "transform": [ @@ -119,7 +120,7 @@ "eth-hd-keyring": "^1.2.2", "eth-json-rpc-filters": "^3.0.1", "eth-json-rpc-infura": "^3.0.0", - "eth-keyring-controller": "^3.1.4", + "eth-keyring-controller": "^3.3.1", "eth-ledger-bridge-keyring": "^0.1.0", "eth-method-registry": "^1.0.0", "eth-phishing-detect": "^1.1.4", @@ -166,7 +167,7 @@ "lodash.uniqby": "^4.7.0", "loglevel": "^1.4.1", "metamascara": "^2.0.0", - "metamask-inpage-provider": "^1.2.2", + "metamask-inpage-provider": "^1.3.0", "metamask-logo": "^2.1.4", "mkdirp": "^0.5.1", "multihashes": "^0.4.12", @@ -211,6 +212,7 @@ "redux-thunk": "^2.2.0", "request-promise": "^4.2.1", "reselect": "^3.0.1", + "safe-event-emitter": "^1.0.1", "sandwich-expando": "^1.1.3", "semaphore": "^1.0.5", "semver": "^5.4.1", @@ -268,14 +270,14 @@ "fs-extra": "^6.0.1", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", - "ganache-core": "^2.1.5", - "geckodriver": "^1.11.0", + "ganache-core": "^2.2.1", + "geckodriver": "^1.14.1", "gh-pages": "^1.2.0", "gifencoder": "^1.1.0", "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp-babel": "^7.0.0", "gulp-json-editor": "^2.2.1", - "gulp-livereload": "^3.8.1", + "gulp-livereload": "^4.0.0", "gulp-multi-process": "^1.3.1", "gulp-replace": "^0.6.1", "gulp-sourcemaps": "^2.6.0", @@ -293,7 +295,7 @@ "jsdom": "^11.2.0", "jsdom-global": "^3.0.2", "jshint-stylish": "~2.2.1", - "karma": "^2.0.4", + "karma": "^3.1.1", "karma-chrome-launcher": "^2.2.0", "karma-cli": "^1.0.1", "karma-firefox-launcher": "^1.0.1", |