diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-01-17 10:34:22 +0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-17 10:34:22 +0400 |
commit | 81b49fba430959ec4e0946f905dc182d2733831c (patch) | |
tree | a1979dafda41ac804986ef57a68912a868cb5ac7 /package.json | |
parent | Remove idle timer dependency (diff) | |
parent | Merge branch 'develop' of github.com:meetfranz/franz into develop (diff) | |
download | ferdium-app-81b49fba430959ec4e0946f905dc182d2733831c.tar.gz ferdium-app-81b49fba430959ec4e0946f905dc182d2733831c.tar.zst ferdium-app-81b49fba430959ec4e0946f905dc182d2733831c.zip |
Merge branch 'develop' into feature/remove-miner
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/package.json b/package.json index bf8c4fec0..34190047b 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.14", | 5 | "version": "5.0.0-beta.15", |
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", |
@@ -33,8 +33,9 @@ | |||
33 | "babel-polyfill": "^6.23.0", | 33 | "babel-polyfill": "^6.23.0", |
34 | "babel-runtime": "^6.23.0", | 34 | "babel-runtime": "^6.23.0", |
35 | "classnames": "^2.2.5", | 35 | "classnames": "^2.2.5", |
36 | "du": "^0.1.0", | ||
36 | "electron-fetch": "^1.1.0", | 37 | "electron-fetch": "^1.1.0", |
37 | "electron-spellchecker": "^1.2.0", | 38 | "electron-spellchecker": "^1.1.2", |
38 | "electron-updater": "^2.4.3", | 39 | "electron-updater": "^2.4.3", |
39 | "electron-window-state": "^4.1.0", | 40 | "electron-window-state": "^4.1.0", |
40 | "fs-extra": "^3.0.1", | 41 | "fs-extra": "^3.0.1", |
@@ -49,15 +50,17 @@ | |||
49 | "mkdirp": "^0.5.1", | 50 | "mkdirp": "^0.5.1", |
50 | "mobx": "^3.1.0", | 51 | "mobx": "^3.1.0", |
51 | "mobx-react": "^4.1.0", | 52 | "mobx-react": "^4.1.0", |
52 | "mobx-react-form": "1.24.0", | 53 | "mobx-react-form": "^1.32.2", |
53 | "mobx-react-router": "^3.1.2", | 54 | "mobx-react-router": "^3.1.2", |
54 | "moment": "^2.17.1", | 55 | "moment": "^2.17.1", |
55 | "normalize-url": "^1.9.1", | 56 | "normalize-url": "^1.9.1", |
57 | "pretty-bytes": "^4.0.2", | ||
56 | "prop-types": "^15.5.10", | 58 | "prop-types": "^15.5.10", |
57 | "prop-types-extended": "^0.2.1", | 59 | "prop-types-extended": "^0.2.1", |
58 | "react": "^15.4.1", | 60 | "react": "^15.4.1", |
59 | "react-addons-css-transition-group": "^15.4.2", | 61 | "react-addons-css-transition-group": "^15.4.2", |
60 | "react-dom": "^15.4.1", | 62 | "react-dom": "^15.4.1", |
63 | "react-dropzone": "^4.2.1", | ||
61 | "react-electron-web-view": "^2.0.1", | 64 | "react-electron-web-view": "^2.0.1", |
62 | "react-intl": "^2.3.0", | 65 | "react-intl": "^2.3.0", |
63 | "react-loader": "^2.4.0", | 66 | "react-loader": "^2.4.0", |
@@ -103,7 +106,7 @@ | |||
103 | "gulp-sass": "^3.1.0", | 106 | "gulp-sass": "^3.1.0", |
104 | "gulp-sass-variables": "^1.1.1", | 107 | "gulp-sass-variables": "^1.1.1", |
105 | "gulp-server-livereload": "^1.9.2", | 108 | "gulp-server-livereload": "^1.9.2", |
106 | "node-sass": "^4.5.3" | 109 | "node-sass": "^4.7.2" |
107 | }, | 110 | }, |
108 | "config": { | 111 | "config": { |
109 | "commitizen": { | 112 | "commitizen": { |