Merge branch 'master' of github.com:siacs/Conversations

This commit is contained in:
Daniel Gultsch 2016-11-20 00:39:25 +01:00
commit 568d6c8392
1 changed files with 5 additions and 0 deletions

View File

@ -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 XEP-0027 with conferences. (The XEP neither specifically allows nor disallows
this.) 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 wont even connect to a server without TLS.
### What clients do I use on other platforms ### What clients do I use on other platforms
There are XMPP Clients available for all major platforms. There are XMPP Clients available for all major platforms.
####Windows / Linux ####Windows / Linux