diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:35:38 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:36:19 +0100 |
| commit | 93137229bf3b04e4589ae315a81ed2de7a171ded (patch) | |
| tree | 703432658a50425e2a295f527c9fdb392211bfd3 /package.json | |
| parent | add workspaces count badge in settings navigation (diff) | |
| download | ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.gz ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.zst ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.zip | |
fix merge conflicts with latest develop
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index df7fa4191..ec135ca77 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", | 5 | "version": "5.0.1-beta.1", |
| 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", |