aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-11-24 15:39:51 +0100
committerGitHub <noreply@github.com>2016-11-24 15:39:51 +0100
commit43fd5e5fe6d475707eaa8cc859329a899bc6d2c9 (patch)
treef120a4f7ea26271cf00500e72e0b8160c01ddff8
parenta87f7903c678d696f7978cf63034032516027c5c (diff)
parent84a4f4d66d8e972704d2b0ea19832918ee508a62 (diff)
Merge pull request #2146 from licaon-kter/patch-4
Add FAQ about the new trust concept
-rw-r--r--README.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/README.md b/README.md
index 45a1ff72..f5a8f994 100644
--- a/README.md
+++ b/README.md
@@ -334,6 +334,10 @@ We briefly had OMEMO as the default E2EE but it turned out to be a usabilty nigh
Quick reminder that Conversations **always** uses TLS to connect to your server. It won‘t even connect to a server without TLS.
+#### What is Blind Trust Before Verification / why are messages marked with a red lock?
+
+Read more about the concept on https://gultsch.de/trust.html
+
### What clients do I use on other platforms
There are XMPP Clients available for all major platforms.
####Windows / Linux