diff options
author | 2019-08-01 14:12:40 +0200 | |
---|---|---|
committer | 2019-08-01 14:12:40 +0200 | |
commit | 46db047cdb769b6bcb4ec7155b146be36b00b352 (patch) | |
tree | 4156710a051640ef436edb0ae673df8253e15f22 | |
parent | Fix eslint issues (diff) | |
parent | Merge branch 'master' into feature/todos (diff) | |
download | ferdium-app-46db047cdb769b6bcb4ec7155b146be36b00b352.tar.gz ferdium-app-46db047cdb769b6bcb4ec7155b146be36b00b352.tar.zst ferdium-app-46db047cdb769b6bcb4ec7155b146be36b00b352.zip |
Merge branch 'feature/todos' of https://github.com/meetfranz/franz into feature/todos
-rw-r--r-- | CHANGELOG.md | 14 | ||||
-rw-r--r-- | package.json | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e5af4ccfa..da7a6c608 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -1,3 +1,17 @@ | |||
1 | ## [5.2.1-beta.1](https://github.com/meetfranz/franz/compare/v5.2.0...v5.2.1-beta.1) (2019-07-30) | ||
2 | |||
3 | |||
4 | ### Bug Fixes | ||
5 | |||
6 | * **Notifications:** Fix issue that blocked notifications from e.g. Slack ([44c413b](https://github.com/meetfranz/franz/commit/44c413b)) | ||
7 | |||
8 | |||
9 | ### Features | ||
10 | |||
11 | * **App:** Add option to copy debug information via the help menu ([4666e85](https://github.com/meetfranz/franz/commit/4666e85)) | ||
12 | |||
13 | |||
14 | |||
1 | # [5.2.0](https://github.com/meetfranz/franz/compare/v5.2.0-beta.4...v5.2.0) (2019-07-19) | 15 | # [5.2.0](https://github.com/meetfranz/franz/compare/v5.2.0-beta.4...v5.2.0) (2019-07-19) |
2 | 16 | ||
3 | ### Features | 17 | ### Features |
diff --git a/package.json b/package.json index bc5079084..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", | 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", |