aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-03-25 09:31:54 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-03-25 09:31:54 +0100
commita6c9a9be99cf9735014f8767b525a8e0a07aa89e (patch)
tree48c8b3571164f427b8227ccb363f3bcffb175b85
parentbump versions (diff)
parentRelease/5.0.1 (#1354) (diff)
downloadferdium-app-a6c9a9be99cf9735014f8767b525a8e0a07aa89e.tar.gz
ferdium-app-a6c9a9be99cf9735014f8767b525a8e0a07aa89e.tar.zst
ferdium-app-a6c9a9be99cf9735014f8767b525a8e0a07aa89e.zip
Merge branch 'master' into develop
-rw-r--r--CHANGELOG.md7
-rw-r--r--package-lock.json2
-rw-r--r--package.json2
3 files changed, 7 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 998d40f4e..32f758097 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,4 @@
1## [5.0.1-beta.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1-beta.1) (2019-03-18) 1# [5.0.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1) (2019-03-25)
2
3 2
4### General 3### General
5 4
@@ -24,6 +23,10 @@
24* **Windows:** Fix losing window when "Keep Franz in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722)) 23* **Windows:** Fix losing window when "Keep Franz in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722))
25 24
26 25
26# [5.0.1-beta.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1-beta.1) (2019-03-18)
27
28[See 5.0.1 changelog.](#5-0-1--2019-03-25-)
29
27 30
28# [5.0.0](https://github.com/meetfranz/franz/compare/5.0.0-beta.24...5.0.0) (2019-02-15) 31# [5.0.0](https://github.com/meetfranz/franz/compare/5.0.0-beta.24...5.0.0) (2019-02-15)
29 32
diff --git a/package-lock.json b/package-lock.json
index a9724bb82..e9b2cdcf2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "franz", 2 "name": "franz",
3 "version": "5.0.0", 3 "version": "5.0.1",
4 "lockfileVersion": 1, 4 "lockfileVersion": 1,
5 "requires": true, 5 "requires": true,
6 "dependencies": { 6 "dependencies": {
diff --git a/package.json b/package.json
index ec135ca77..8f5c2e8c8 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.1-beta.1", 5 "version": "5.0.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",