diff options
author | 2019-07-01 13:39:55 +0700 | |
---|---|---|
committer | 2019-07-01 13:39:55 +0700 | |
commit | b43b265e8d383eb9b6f0a31f096f52ad9f7171c2 (patch) | |
tree | 6b258426b849520ae29d92a44fe2aa7c608ad80b /package.json | |
parent | Add features list to README (diff) | |
parent | Revert: fix spellchecker (diff) | |
download | ferdium-app-b43b265e8d383eb9b6f0a31f096f52ad9f7171c2.tar.gz ferdium-app-b43b265e8d383eb9b6f0a31f096f52ad9f7171c2.tar.zst ferdium-app-b43b265e8d383eb9b6f0a31f096f52ad9f7171c2.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/package.json b/package.json index c1a8c310f..517dd1c6f 100644 --- a/package.json +++ b/package.json | |||
@@ -2,7 +2,7 @@ | |||
2 | "name": "franz", | 2 | "name": "franz", |
3 | "productName": "Franz", | 3 | "productName": "Franz", |
4 | "appId": "com.meetfranz.franz", | 4 | "appId": "com.meetfranz.franz", |
5 | "version": "5.1.0", | 5 | "version": "5.2.0-beta.3", |
6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", | 6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", |
7 | "copyright": "adlk x franz - Stefan Malzner", | 7 | "copyright": "adlk x franz - Stefan Malzner", |
8 | "main": "index.js", | 8 | "main": "index.js", |
@@ -34,9 +34,9 @@ | |||
34 | "author": "Stefan Malzner <stefan@adlk.io>", | 34 | "author": "Stefan Malzner <stefan@adlk.io>", |
35 | "license": "Apache-2.0", | 35 | "license": "Apache-2.0", |
36 | "dependencies": { | 36 | "dependencies": { |
37 | "@babel/polyfill": "^7.0.0", | 37 | "@babel/polyfill": "7.4.4", |
38 | "@babel/runtime": "^7.0.0", | 38 | "@babel/runtime": "7.4.5", |
39 | "@meetfranz/electron-notification-state": "^1.0.0", | 39 | "@meetfranz/electron-notification-state": "1.0.0", |
40 | "@meetfranz/forms": "file:packages/forms", | 40 | "@meetfranz/forms": "file:packages/forms", |
41 | "@meetfranz/theme": "file:packages/theme", | 41 | "@meetfranz/theme": "file:packages/theme", |
42 | "@meetfranz/ui": "file:packages/ui", | 42 | "@meetfranz/ui": "file:packages/ui", |
@@ -86,6 +86,7 @@ | |||
86 | "smoothscroll-polyfill": "^0.3.4", | 86 | "smoothscroll-polyfill": "^0.3.4", |
87 | "tar": "^4.0.2", | 87 | "tar": "^4.0.2", |
88 | "uuid": "^3.0.1", | 88 | "uuid": "^3.0.1", |
89 | "validator": "11.0.0", | ||
89 | "ws": "6.2.1" | 90 | "ws": "6.2.1" |
90 | }, | 91 | }, |
91 | "devDependencies": { | 92 | "devDependencies": { |
@@ -117,8 +118,8 @@ | |||
117 | "cross-env": "^5.0.5", | 118 | "cross-env": "^5.0.5", |
118 | "cz-conventional-changelog": "2.1.0", | 119 | "cz-conventional-changelog": "2.1.0", |
119 | "dotenv": "^4.0.0", | 120 | "dotenv": "^4.0.0", |
120 | "electron": "4.1.4", | 121 | "electron": "4.2.4", |
121 | "electron-builder": "20.38.4", | 122 | "electron-builder": "20.40.2", |
122 | "electron-rebuild": "1.8.4", | 123 | "electron-rebuild": "1.8.4", |
123 | "eslint": "5.10.0", | 124 | "eslint": "5.10.0", |
124 | "eslint-config-airbnb": "17.1.0", | 125 | "eslint-config-airbnb": "17.1.0", |