aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-11-20 00:39:25 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-11-20 00:39:25 +0100
commit568d6c8392b49ecdd3b1a830fdc6265e264335a7 (patch)
tree81ed32971aadab1bea2b9a92fb29a9a714fbdffb
parent64e8035f6d36073f5a6d438b2519a87c6ed99f07 (diff)
parent7ec38bd2028c8423447358f82932cf3cbb4fade2 (diff)
Merge branch 'master' of github.com:siacs/Conversations
-rw-r--r--README.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/README.md b/README.md
index 75018ba8..45a1ff72 100644
--- a/README.md
+++ b/README.md
@@ -329,6 +329,11 @@ feature is regarded experimental. Conversations is the only client that uses
XEP-0027 with conferences. (The XEP neither specifically allows nor disallows
this.)
+#### Why is Conversations not end-to-end encrypted by default
+We briefly had OMEMO as the default E2EE but it turned out to be a usabilty nightmare and thus we reverted that. You can find more information in [the commit message](https://github.com/siacs/Conversations/commit/035d0c79572d5981c53d1bff7f30b484c6542f17) of that change.
+
+Quick reminder that Conversations **always** uses TLS to connect to your server. It won‘t even connect to a server without TLS.
+
### What clients do I use on other platforms
There are XMPP Clients available for all major platforms.
####Windows / Linux