Merge branch 'development' of github.com:siacs/Conversations into development

This commit is contained in:
Daniel Gultsch 2014-05-09 20:57:08 +02:00
commit f0eb80eb5c

View file

@ -1,5 +1,5 @@
#Conversations #Conversations
Conversations is an open source XMPP (formally known as Jabber) client for Conversations is an open source XMPP (formerly known as Jabber) client for
Android 4.0+ smart phones. Android 4.0+ smart phones.
[![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_45.png)](https://play.google.com/store/apps/details?id=eu.siacs.conversations)