aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-10 10:52:21 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-10 10:52:21 +0200
commit15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (patch)
tree9a2152390f39c4a9c79490a0938f57fe728140f2 /README.md
parentae3ff5757d5d6e6e4359ecdefb6e98a9bd69c4a1 (diff)
parent331be08859d68fa6a034b39c674fd7bb929c4a5c (diff)
Merge branch 'development'
Diffstat (limited to 'README.md')
-rw-r--r--README.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/README.md b/README.md
index ec510c15..da376cf6 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,7 @@ These XEPs are - as of now:
* [Ilia Rostovtsev](https://github.com/qooob) (Russian)
* [Jelmer Vernooij](https://github.com/jelmer) (Dutch)
* [Anders Sandblad](https://github.com/andersruneson) (Swedish)
+* [Aizaz AZ](http://www.linkedin.com/in/aizazhaider) (Chinese)
##FAQ
###General
@@ -81,7 +82,7 @@ The more convenient way - which not only gives you automatic updates but also
supports the further development of Conversations - is to buy the App in the Google
[Play Store](https://play.google.com/store/apps/details?id=eu.siacs.conversations).
####I don't have a Google Account but I would still like to make a contribution
-I accept donations over PayPal and BitCoin. For donations via PayPal you can use the email address donate@siacs.eu or the button below.
+I accept donations over PayPal, BitCoin and Flattr. For donations via PayPal you can use the email address donate@siacs.eu or the button below.
[![Donate with PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=CW3SYT3KG5PDL)
@@ -91,6 +92,9 @@ transfer (SEPA).
My Bitcoin Address is: 1NxSU1YxYzJVDpX1rcESAA3NJki7kRgeeu
+
+[![Flattr this!](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=inputmice&url=https%3A%2F%2Fgithub.com%2Fsiacs%2FConversations)
+
####How do I create an account?
XMPP like email for example is a federated protocol which means that there is
not one company you can create your 'official xmpp account' with but there are