Merge branch 'master' into dev

8 months ago · dc6f408f2d
parent da1c65cddd dbf54ce73c
commit dc6f408f2d
3 changed files with 15 additions and 0 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,6 +6,11 @@ For support you can use [the contact form](https://contact.faircode.eu/?product=

 ### [Wintonotitan](https://en.wikipedia.org/wiki/Wintonotitan)

+### Future version
+
+* Replaced [javadns](https://github.com/dnsjava/dnsjava) by [MiniDNS](https://github.com/MiniDNS/minidns)
+* Added account/identity option to enforce DANE, see [the FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#faq202)
+
 ### Next version

 * Small improvements and minor bug fixes
--- a/app/src/main/assets/CHANGELOG.md
+++ b/app/src/main/assets/CHANGELOG.md
@ -6,6 +6,11 @@ For support you can use [the contact form](https://contact.faircode.eu/?product=

 ### [Wintonotitan](https://en.wikipedia.org/wiki/Wintonotitan)

+### Future version
+
+* Replaced [javadns](https://github.com/dnsjava/dnsjava) by [MiniDNS](https://github.com/MiniDNS/minidns)
+* Added account/identity option to enforce DANE, see [the FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#faq202)
+
 ### Next version

 * Small improvements and minor bug fixes
--- a/metadata/en-US/changelogs/2146.txt
+++ b/metadata/en-US/changelogs/2146.txt
@ -6,6 +6,11 @@ For support you can use the contact form.

 Wintonotitan

+Future version
+
+* Replaced javadns
+* Added account/identity option to enforce DANE, see the FAQ
+
 Next version

 * Small improvements and minor bug fixes