diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-07 12:25:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-07 12:25:00 +0100 |
commit | c55885e69e195e4413fda3bffffafeaee7c0c9d5 (patch) | |
tree | b13a2894796e45df60c92cf4c999b2974d400091 /package.json | |
parent | Fix lint errors (diff) | |
parent | fix(App): Prevent app from redirecting when dropping link (diff) | |
download | ferdium-app-c55885e69e195e4413fda3bffffafeaee7c0c9d5.tar.gz ferdium-app-c55885e69e195e4413fda3bffffafeaee7c0c9d5.tar.zst ferdium-app-c55885e69e195e4413fda3bffffafeaee7c0c9d5.zip |
Merge branch 'develop' into reload-crashed-service
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json index dcb05bf6a..9b56cdf27 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.0.0-beta.11", | 5 | "version": "5.0.0-beta.13", |
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", |
@@ -27,12 +27,13 @@ | |||
27 | "license": "Apache-2.0", | 27 | "license": "Apache-2.0", |
28 | "dependencies": { | 28 | "dependencies": { |
29 | "@paulcbetts/system-idle-time": "^1.0.4", | 29 | "@paulcbetts/system-idle-time": "^1.0.4", |
30 | "address-rfc2822": "^2.0.1", | ||
31 | "auto-launch": "https://github.com/meetfranz/node-auto-launch.git", | ||
30 | "babel-polyfill": "^6.23.0", | 32 | "babel-polyfill": "^6.23.0", |
31 | "babel-runtime": "^6.23.0", | 33 | "babel-runtime": "^6.23.0", |
32 | "classnames": "^2.2.5", | 34 | "classnames": "^2.2.5", |
33 | "electron-fetch": "^1.1.0", | 35 | "electron-fetch": "^1.1.0", |
34 | "electron-spellchecker": "^1.2.0", | 36 | "electron-spellchecker": "^1.2.0", |
35 | "electron-squirrel-startup": "^1.0.0", | ||
36 | "electron-updater": "^2.4.3", | 37 | "electron-updater": "^2.4.3", |
37 | "electron-window-state": "^4.1.0", | 38 | "electron-window-state": "^4.1.0", |
38 | "fs-extra": "^3.0.1", | 39 | "fs-extra": "^3.0.1", |