diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-03 17:08:49 +0200 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-03 17:08:49 +0200 |
| commit | fc4988cd5e54f44779f13732961a3f7b00619eaf (patch) | |
| tree | 9e39d2d3baabba44a50cbde3649045579a51d7f6 /CHANGELOG.md | |
| parent | add workspace premium badge in settings nav (diff) | |
| parent | fix shitty twitter account typo (diff) | |
| download | ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.tar.gz ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.tar.zst ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.zip | |
fixes conflicts with latest develop
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 998d40f4e..175ce06d7 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,9 @@ | |||
| 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-) | ||
| 27 | 29 | ||
| 28 | # [5.0.0](https://github.com/meetfranz/franz/compare/5.0.0-beta.24...5.0.0) (2019-02-15) | 30 | # [5.0.0](https://github.com/meetfranz/franz/compare/5.0.0-beta.24...5.0.0) (2019-02-15) |
| 29 | 31 | ||