diff options
| author |  Amine Mouafik <amine@mouafik.fr> | 2019-08-05 19:06:51 +0700 |
|---|---|---|
| committer | Amine Mouafik <amine@mouafik.fr> | 2019-08-05 19:06:51 +0700 |
| commit | 19ff9d112fda59d114df1079622a3d365a51c14a (patch) | |
| tree | 90e3e09e051a96a78ec80cd34363a062eac089a3 /package.json | |
| parent | Mention releases in README (diff) | |
| parent | bump version to 5.2.1-beta.1 (diff) | |
| download | ferdium-app-19ff9d112fda59d114df1079622a3d365a51c14a.tar.gz ferdium-app-19ff9d112fda59d114df1079622a3d365a51c14a.tar.zst ferdium-app-19ff9d112fda59d114df1079622a3d365a51c14a.zip | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/components/layout/AppLayout.js
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 517dd1c6f..639d078a0 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.2.0-beta.3", | 5 | "version": "5.2.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", |