diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-11-25 16:58:37 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-11-25 16:58:37 +0100 |
commit | 22ca8200fa28ea033ab6755443f9c845d2135ca9 (patch) | |
tree | 814ee1a8272db9158d869847d7afae0d0f00fca7 | |
parent | f36dff485e9c818e2b4237ea8d2254c254649b23 (diff) | |
parent | 988cce6320b2affb13dcb2abcf6a54736dcdc199 (diff) |
Merge branch 'master' of github.com:siacs/Conversations
-rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -341,7 +341,7 @@ 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 -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 Unfortunatly we don‘t 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. |