aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-04-12 13:32:19 +0200
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-04-12 13:32:19 +0200
commitf941074dd7520efb63e9507294df8c420715b9df (patch)
tree614d03296254f02fe93a67a5c3b2feef1446e3aa /package.json
parentDon't invalidate user request on componentWillMount (diff)
parentfeat(App): Update electron to 4.1.4 (diff)
downloadferdium-app-f941074dd7520efb63e9507294df8c420715b9df.tar.gz
ferdium-app-f941074dd7520efb63e9507294df8c420715b9df.tar.zst
ferdium-app-f941074dd7520efb63e9507294df8c420715b9df.zip
Merge branch 'develop' into chore/streamline-dashboard
Diffstat (limited to 'package.json')
-rw-r--r--package.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json
index 481e44af1..49811a4a1 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
52 "electron-window-state": "5.0.3", 52 "electron-window-state": "5.0.3",
53 "fs-extra": "7.0.1", 53 "fs-extra": "7.0.1",
54 "hex-to-rgba": "1.0.2", 54 "hex-to-rgba": "1.0.2",
55 "jsonwebtoken": "^7.4.1", 55 "jsonwebtoken": "8.5.1",
56 "lodash": "^4.17.4", 56 "lodash": "^4.17.4",
57 "mdi": "^1.9.33", 57 "mdi": "^1.9.33",
58 "mime-types": "2.1.21", 58 "mime-types": "2.1.21",
@@ -114,7 +114,7 @@
114 "cross-env": "^5.0.5", 114 "cross-env": "^5.0.5",
115 "cz-conventional-changelog": "2.1.0", 115 "cz-conventional-changelog": "2.1.0",
116 "dotenv": "^4.0.0", 116 "dotenv": "^4.0.0",
117 "electron": "4.0.8", 117 "electron": "4.1.4",
118 "electron-builder": "20.38.4", 118 "electron-builder": "20.38.4",
119 "electron-rebuild": "1.8.4", 119 "electron-rebuild": "1.8.4",
120 "eslint": "5.10.0", 120 "eslint": "5.10.0",