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

This commit is contained in:
Daniel Gultsch 2016-11-25 16:58:37 +01:00
commit 22ca8200fa

View file

@ -341,7 +341,7 @@ Read more about the concept on https://gultsch.de/trust.html
### 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
For your desktop computer we recommend that you use [Gajim](https://gajim.org). You need to install the plugins `OMEMO`, `HTTP Upload` and `URL image preview` to get the best compatibiltiy with Conversations. Plugins can be installed from withhin the app. For your desktop computer we recommend that you use [Gajim](https://gajim.org). You need to install the plugins `OMEMO`, `HTTP Upload` and `URL image preview` to get the best compatibiltiy with Conversations. Plugins can be installed from within the app.
####iOS ####iOS
Unfortunatly we dont have a recommendation for iPhones right now. There are two clients available [ChatSecure](https://chatsecure.org/) and [Monal](https://monal.im/). Both with their own pros and cons. Unfortunatly we dont have a recommendation for iPhones right now. There are two clients available [ChatSecure](https://chatsecure.org/) and [Monal](https://monal.im/). Both with their own pros and cons.