diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-07-16 13:26:12 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-07-16 13:26:12 +0200 |
| commit | a31ab555b89739de29bfe8503bd38713c7b42502 (patch) | |
| tree | 116e439f622df2ec6a282f5305f0d309fad6d0dd | |
| parent | 7bd66549d87e6c690c115ef3995c4606d0a9415f (diff) | |
| parent | 43fb216e720ad31cd1c525a1be645bbb28599e5b (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
| -rw-r--r-- | README.md | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -56,9 +56,8 @@ run your own XMPP server for you and your friends. These XEP's are: * XEP-0352: Client State Indication lets the server know whether or not Conversations is in the background. Allows the server to save bandwidth by withholding unimportant packages. - without removing them from your roster. * XEP-xxxx: HttpUpload allows you to share files in conferences and with offline - contacts. Requires and [additional component](https://github.com/siacs/HttpUploadComponent) + contacts. Requires an [additional component](https://github.com/siacs/HttpUploadComponent) on your server. ## Team @@ -256,7 +255,7 @@ decrypting and encrypting takes longer than OTR. It is however asynchronous and works well with message carbons. To use OpenPGP you have to install the open source app -[OpenKeychain](www.openkeychain.org) and then long press on the account in +[OpenKeychain](http://www.openkeychain.org) and then long press on the account in manage accounts and choose renew PGP announcement from the contextual menu. #### How does the encryption for conferences work? |