diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-04-20 20:33:04 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-04-20 20:33:04 +0200 |
commit | cfc4fbaa101fa95e710f695af5e9e11a5e8c8f41 (patch) | |
tree | 255241a8b8c8d98b3553f2fe6aa6f6a0108cf956 | |
parent | e7972d3d112065f37b1b4d99584ecc8f1ca8fd32 (diff) | |
parent | 69b43556525a3a2a1565dbbe3289399d51cc642f (diff) |
Merge branch 'development' of github.com:siacs/Conversations into development
-rw-r--r-- | README.md | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 |