aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-11-25 16:58:37 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-11-25 16:58:37 +0100
commit22ca8200fa28ea033ab6755443f9c845d2135ca9 (patch)
tree814ee1a8272db9158d869847d7afae0d0f00fca7
parentf36dff485e9c818e2b4237ea8d2254c254649b23 (diff)
parent988cce6320b2affb13dcb2abcf6a54736dcdc199 (diff)
Merge branch 'master' of github.com:siacs/Conversations
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index f5a8f994..38e8f512 100644
--- a/README.md
+++ b/README.md
@@ -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.