Merge branch 'release-4.0'

This commit is contained in:
Yuya Ochiai 2018-01-29 23:15:21 +09:00
commit f8b0378657
2 changed files with 4 additions and 4 deletions

View file

@ -46,7 +46,7 @@
"cross-env": "^4.0.0",
"css-loader": "^0.28.1",
"devtron": "^1.4.0",
"electron": "1.7.9",
"electron": "1.7.11",
"electron-builder": "17.4.0",
"electron-builder-squirrel-windows": "17.4.0",
"electron-connect": "^0.6.1",

View file

@ -1659,9 +1659,9 @@ electron-to-chromium@^1.2.7:
version "1.3.20"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.20.tgz#2eedd5ccbae7ddc557f68ad1fce9c172e915e4e5"
electron@1.7.9:
version "1.7.9"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.9.tgz#add54e9f8f83ed02f6519ec10135f698b19336cf"
electron@1.7.11:
version "1.7.11"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.11.tgz#993b6aa79e0e79a7cfcc369f4c813fbd9a0b08d9"
dependencies:
"@types/node" "^7.0.18"
electron-download "^3.0.1"