Merge branch 'master' into dependabot/npm_and_yarn/app/electron-rebuild-2.3.5

2021-04-01 19:29:24 +09:00 · 2021-04-01 19:29:24 +09:00 · 0142113bc6
commit 0142113bc6
parent 6adfca8f52 e0afa2b4a0
2 changed files with 422 additions and 190 deletions
--- a/app/package.json
+++ b/app/package.json
@ -81,7 +81,7 @@
        "browserify": "^17.0.0",
        "chokidar": "^3.5.1",
        "electron": "^10.2.0",
-        "electron-builder": "^22.9.1",
+        "electron-builder": "^22.10.5",
        "electron-rebuild": "^2.3.5",
        "eslint": "^7.23.0",
        "readline-sync": "1.4.10"
--- a/app/yarn.lock
+++ b/app/yarn.lock