diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-04-04 20:03:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-04 20:03:09 +0200 |
commit | 5e982f8efb020e3a8b3866edd09879295a70ceab (patch) | |
tree | 89d4bc3632efc05822c0bec53a883b2d092bfd69 | |
parent | Merge branch 'i18n' into release/5.0.0-beta.18 (diff) | |
parent | Fix typo [ci skip] (diff) | |
download | ferdium-app-5e982f8efb020e3a8b3866edd09879295a70ceab.tar.gz ferdium-app-5e982f8efb020e3a8b3866edd09879295a70ceab.tar.zst ferdium-app-5e982f8efb020e3a8b3866edd09879295a70ceab.zip |
Merge branch 'master' into release/5.0.0-beta.18
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | README.md | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 035573c7a..cdc89b325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | ### General | 20 | ### General |
21 | 21 | ||
22 | * **App:** Various performance improvments | 22 | * **App:** Various performance improvements |
23 | * **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** | 23 | * **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** |
24 | 24 | ||
25 | 25 | ||
@@ -60,12 +60,5 @@ Join the Franz community on [Slack](http://slack.franz.im) and get in touch with | |||
60 | You can find all the Information at the [Plugins repository](https://github.com/meetfranz/plugins). | 60 | You can find all the Information at the [Plugins repository](https://github.com/meetfranz/plugins). |
61 | For questions feel free to ask in the [community Slack](http://slack.franz.im) | 61 | For questions feel free to ask in the [community Slack](http://slack.franz.im) |
62 | 62 | ||
63 | ## Next steps | ||
64 | - [ ] Create acceptance tests | ||
65 | - [ ] Create Linux build | ||
66 | - [ ] 5.0 stable release | ||
67 | - [ ] Developer Documentation | ||
68 | - [ ] Add translations | ||
69 | |||
70 | ## License | 63 | ## License |
71 | Franz 5 is open-source licensed under the Apache-2.0 License. | 64 | Franz 5 is open-source licensed under the Apache-2.0 License. |