diff options
| author |  vantezzen <properly@protonmail.com> | 2019-09-09 11:31:32 +0200 |
|---|---|---|
| committer | vantezzen <properly@protonmail.com> | 2019-09-09 11:31:32 +0200 |
| commit | 22e23344ce7d0b8cb181339740156c853322e682 (patch) | |
| tree | 080b175637519eb0070e9f73eb0f100d26bdd734 /CHANGELOG.md | |
| parent | Fix missing Ferdi branding as suggested in #25 (diff) | |
| parent | fix headline hierachy (diff) | |
| download | ferdium-app-22e23344ce7d0b8cb181339740156c853322e682.tar.gz ferdium-app-22e23344ce7d0b8cb181339740156c853322e682.tar.zst ferdium-app-22e23344ce7d0b8cb181339740156c853322e682.zip | |
Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.3.0
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d43ea2e2f..25ba1b521 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | ## [5.3.2](https://github.com/kytwb/ferdi/compare/v5.3.0...v5.3.2) (2019-09-07) | 1 | ## [5.3.1](https://github.com/kytwb/ferdi/compare/v5.3.0...v5.3.1) (2019-09-09) |
| 2 | Merge Franz v5.3.0 into Ferdi. | 2 | Merge Franz v5.3.1 into Ferdi. |
| 3 | 3 | ||
| 4 | - Enable todos for all users | 4 | - Enable todos for all users |
| 5 | - Fix WhatsApp recipe not working (#19 and #21) | ||
| 5 | 6 | ||
| 6 | ### Bug Fixes | 7 | ### Bug Fixes |
| 7 | 8 | ||
| @@ -14,11 +15,6 @@ Merge Franz v5.3.0 into Ferdi. | |||
| 14 | * **Todos:** Add option to disable todos ([5d03b91](https://github.com/kytwb/ferdi/commit/5d03b91)) | 15 | * **Todos:** Add option to disable todos ([5d03b91](https://github.com/kytwb/ferdi/commit/5d03b91)) |
| 15 | 16 | ||
| 16 | 17 | ||
| 17 | |||
| 18 | ## [5.3.1](https://github.com/kytwb/ferdi/compare/v5.3.0...v5.3.1) (2019-09-06) | ||
| 19 | - Fix WhatsApp recipe not working (#19 and #21) | ||
| 20 | |||
| 21 | |||
| 22 | ## [5.3.0](https://github.com/kytwb/ferdi/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06) | 18 | ## [5.3.0](https://github.com/kytwb/ferdi/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06) |
| 23 | - Removes pages begging you to donate after registration | 19 | - Removes pages begging you to donate after registration |
| 24 | - Makes all users Premium by default | 20 | - Makes all users Premium by default |