sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'development' of github.com:siacs/Conversations into development

This commit is contained in:
Daniel Gultsch 2015-07-16 13:26:12 +02:00
parent 7bd66549d8 43fb216e72
commit a31ab555b8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -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 * XEP-0352: Client State Indication lets the server know whether or not
Conversations is in the background. Allows the server to save bandwidth by Conversations is in the background. Allows the server to save bandwidth by
withholding unimportant packages. withholding unimportant packages.
without removing them from your roster.
* XEP-xxxx: HttpUpload allows you to share files in conferences and with offline * 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. on your server.
## Team ## Team
@ -256,7 +255,7 @@ decrypting and encrypting takes longer than OTR. It is however asynchronous and
works well with message carbons. works well with message carbons.
To use OpenPGP you have to install the open source app 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. manage accounts and choose renew PGP announcement from the contextual menu.
#### How does the encryption for conferences work? #### How does the encryption for conferences work?