aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2017-01-31 21:45:43 +0100
committerGitHub <noreply@github.com>2017-01-31 21:45:43 +0100
commit5fd91fcd8e1687cdcde39d0c63adc1775389e91f (patch)
tree8ad46efc76daf6b94e0902f18306cdb6f3eee9a7
parent8a1ebf2bbe5abbeff61dfedecb50b973401f1b1f (diff)
parentcd3ce7611555c37322250f1d2c50fc1f0c88089c (diff)
Merge pull request #2272 from mimi89999/patch-3HEADmaster
Correct a typo in the README
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 6792c5b7..0afb919d 100644
--- a/README.md
+++ b/README.md
@@ -298,7 +298,7 @@ To use OpenPGP you have to install the open source app
manage accounts and choose renew PGP announcement from the contextual menu.
#### OMEMO is grayed out. What do I do?
-OMEMO has two requirements: Your server and the server of your contact need to support PEP. Both of you can verify that individually by opening your account details and selecting ```Server info``` from the menu. The appearing table should list PEP as available. The second requirement is mutual presence subscription. You can verify that by opening the contact details and see if the both check boxes *Send presence updates* and *Receive presence updates* are checked.
+OMEMO has two requirements: Your server and the server of your contact need to support PEP. Both of you can verify that individually by opening your account details and selecting ```Server info``` from the menu. The appearing table should list PEP as available. The second requirement is mutual presence subscription. You can verify that by opening the contact details and see if both check boxes *Send presence updates* and *Receive presence updates* are checked.
#### How does the encryption for conferences work?