summaryrefslogtreecommitdiff
path: root/doc/tipjar.mdwn
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-07-24 11:19:28 +0200
committerintrigeri <intrigeri@boum.org>2010-07-24 11:19:28 +0200
commit2f71e7f8f5a5c69753fb77c897d4446cdc23f856 (patch)
tree144bd3fb2710042f8b9fddd9c47b05cad90e8ff9 /doc/tipjar.mdwn
parentd98296d1db02febfa7cc4fbe7f304ca2a9858fef (diff)
parent11bd781a9dc8c04a005a04a99845ec339079b610 (diff)
Merge remote branch 'upstream/master' into prv/po
Diffstat (limited to 'doc/tipjar.mdwn')
-rw-r--r--doc/tipjar.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn
index b725a2eff..ae612e129 100644
--- a/doc/tipjar.mdwn
+++ b/doc/tipjar.mdwn
@@ -5,6 +5,9 @@ choose. If you'd like to fund development of a specific feature, see the
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=joey%40kitenet%2enet&item_name=ikiwiki&no_shipping=1&cn=Comments%3f&tax=0&currency_code=USD&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8"><img src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" alt="donate with PayPal" /></a>
+<script type="text/javascript">var flattr_url = 'http://ikiwiki.info';</script>
+<script src="http://api.flattr.com/button/load.js" type="text/javascript"></script>
+
Thanks to the following people for their kind contributions:
* James Westby