aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorLibravatar Bennett <hello@vantezzen.io>2020-09-17 10:06:44 +0200
committerLibravatar Bennett <hello@vantezzen.io>2020-09-17 10:06:44 +0200
commit5a3037063aaaae419003598ca4db7598c8e9df4e (patch)
treefe2a15754b3b7eb9b2ca6a107eed3189f93fb0c4 /package.json
parentUpdate submodules (diff)
parentAdd Norwegian (diff)
downloadferdium-app-5a3037063aaaae419003598ca4db7598c8e9df4e.tar.gz
ferdium-app-5a3037063aaaae419003598ca4db7598c8e9df4e.tar.zst
ferdium-app-5a3037063aaaae419003598ca4db7598c8e9df4e.zip
Merge branch 'develop' into release5.6.0-beta.3
Diffstat (limited to 'package.json')
-rw-r--r--package.json11
1 files changed, 5 insertions, 6 deletions
diff --git a/package.json b/package.json
index 09a69f00e..a8d52da5d 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
59 "@meetfranz/forms": "file:packages/forms", 59 "@meetfranz/forms": "file:packages/forms",
60 "@meetfranz/theme": "file:packages/theme", 60 "@meetfranz/theme": "file:packages/theme",
61 "@meetfranz/ui": "file:packages/ui", 61 "@meetfranz/ui": "file:packages/ui",
62 "@sentry/electron": "1.1.0", 62 "@sentry/electron": "1.3.0",
63 "address-rfc2822": "^2.0.1", 63 "address-rfc2822": "^2.0.1",
64 "atob": "2.1.2", 64 "atob": "2.1.2",
65 "auto-launch": "5.0.5", 65 "auto-launch": "5.0.5",
@@ -78,7 +78,6 @@
78 "electron-process-manager": "git+https://git@github.com/dizer/electron-process-manager.git", 78 "electron-process-manager": "git+https://git@github.com/dizer/electron-process-manager.git",
79 "electron-process-reporter": "git+https://git@github.com/dizer/electron-process-reporter.git", 79 "electron-process-reporter": "git+https://git@github.com/dizer/electron-process-reporter.git",
80 "electron-react-titlebar": "0.8.2", 80 "electron-react-titlebar": "0.8.2",
81 "electron-spellchecker": "2.2.1",
82 "electron-updater": "4.2.5", 81 "electron-updater": "4.2.5",
83 "electron-util": "0.14.0", 82 "electron-util": "0.14.0",
84 "electron-window-state": "5.0.3", 83 "electron-window-state": "5.0.3",
@@ -92,7 +91,7 @@
92 "lodash": "^4.17.4", 91 "lodash": "^4.17.4",
93 "mac-screen-capture-permissions": "1.1.0", 92 "mac-screen-capture-permissions": "1.1.0",
94 "macos-version": "5.2.0", 93 "macos-version": "5.2.0",
95 "marked": "0.6.1", 94 "marked": "0.7.0",
96 "mdi": "^1.9.33", 95 "mdi": "^1.9.33",
97 "mime-types": "2.1.25", 96 "mime-types": "2.1.25",
98 "mobx": "5.15.0", 97 "mobx": "5.15.0",
@@ -102,7 +101,7 @@
102 "mobx-react-router": "3.1.2", 101 "mobx-react-router": "3.1.2",
103 "moment": "^2.17.1", 102 "moment": "^2.17.1",
104 "ms": "2.1.2", 103 "ms": "2.1.2",
105 "node-fetch": "2.6.0", 104 "node-fetch": "2.6.1",
106 "normalize-url": "5.0.0", 105 "normalize-url": "5.0.0",
107 "pretty-bytes": "^4.0.2", 106 "pretty-bytes": "^4.0.2",
108 "prop-types": "^15.5.10", 107 "prop-types": "^15.5.10",
@@ -160,10 +159,10 @@
160 "cross-env": "^5.0.5", 159 "cross-env": "^5.0.5",
161 "cz-conventional-changelog": "2.1.0", 160 "cz-conventional-changelog": "2.1.0",
162 "dotenv": "^4.0.0", 161 "dotenv": "^4.0.0",
163 "electron": "8.2.3", 162 "electron": "9.0.3",
164 "electron-builder": "22.4.1", 163 "electron-builder": "22.4.1",
165 "electron-notarize": "0.2.1", 164 "electron-notarize": "0.2.1",
166 "electron-rebuild": "1.10.0", 165 "electron-rebuild": "1.11.0",
167 "eslint": "5.10.0", 166 "eslint": "5.10.0",
168 "eslint-config-airbnb": "17.1.0", 167 "eslint-config-airbnb": "17.1.0",
169 "eslint-loader": "^1.9.0", 168 "eslint-loader": "^1.9.0",