aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-04-20 20:33:04 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-04-20 20:33:04 +0200
commitcfc4fbaa101fa95e710f695af5e9e11a5e8c8f41 (patch)
tree255241a8b8c8d98b3553f2fe6aa6f6a0108cf956 /README.md
parente7972d3d112065f37b1b4d99584ecc8f1ca8fd32 (diff)
parent69b43556525a3a2a1565dbbe3289399d51cc642f (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'README.md')
-rw-r--r--README.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/README.md b/README.md
index ac075fd3..5519e47f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
Conversations: the very last word in instant messaging
-[![Google Play](http://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=eu.siacs.conversations)
+[![Google Play](http://developer.android.com/images/brand/en_generic_rgb_wo_60.png)](https://play.google.com/store/apps/details?id=eu.siacs.conversations) [![Amazon App Store](https://images-na.ssl-images-amazon.com/images/G/01/AmazonMobileApps/amazon-apps-store-us-black.png)](http://www.amazon.com/dp/B00WD35AAC/)
![screenshots](https://raw.githubusercontent.com/siacs/Conversations/master/screenshots.png)
@@ -17,7 +17,8 @@ Conversations: the very last word in instant messaging
## Features
* End-to-end encryption with either [OTR](https://otr.cypherpunks.ca/) or [OpenPGP](http://www.openpgp.org/about_openpgp/)
-* Sending and receiving images
+* Send and receive images as well as other kind of files
+* Share your location via an external [plug-in](https://play.google.com/store/apps/details?id=eu.siacs.conversations.sharelocation)
* Indication when your contact has read your message
* Intuitive UI that follows Android Design guidelines
* Pictures / Avatars for your Contacts