summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2017-11-17 10:29:14 +0100
committerAndrej Mihajlov <and@mullvad.net>2017-11-17 10:29:14 +0100
commitb9ff361e7d6b3227a1aa61c3db8d5810b81bca6a (patch)
treec2fe0f9f5950e7dfacfa7354c7ce58da53a79956
parent26f16b1588e63a40261a0386ad54145e39618cc2 (diff)
parente6f73dbe1aa386e96df4bad10f22a72677cbe375 (diff)
downloadmullvadvpn-b9ff361e7d6b3227a1aa61c3db8d5810b81bca6a.tar.xz
mullvadvpn-b9ff361e7d6b3227a1aa61c3db8d5810b81bca6a.zip
Merge branch 'upgrade-dev-tools'
-rw-r--r--package.json2
-rw-r--r--yarn.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json
index c5479ec8bc..88cb2bcafc 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
"chai": "^4.1.0",
"electron": "^1.7.9",
"electron-builder": "^19.37.2",
- "electron-devtools-installer": "^2.1.0",
+ "electron-devtools-installer": "^2.2.1",
"electron-mocha": "^3.3.0",
"enzyme": "^2.9.1",
"eslint": "^4.1.1",
diff --git a/yarn.lock b/yarn.lock
index c8593120de..42a9554e15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2044,9 +2044,9 @@ electron-builder@^19.37.2:
update-notifier "^2.3.0"
yargs "^9.0.1"
-electron-devtools-installer@^2.1.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.0.tgz#9813e6811afcd69ddca3cae5416db72ea7ecfb6a"
+electron-devtools-installer@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.1.tgz#0beb73ccbf65cbc4d09e706cebda638f839b8c55"
dependencies:
"7zip" "0.0.6"
cross-unzip "0.0.2"