Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / doc / tipjar.mdwn

diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn
index e678053bb0127962cb32765b12f5c06c94723e0a..ae612e129d8812bd2c9b8e1d12570b11bb27f623 100644 (file)
--- 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
@@ -12,6 +15,10 @@ Thanks to the following people for their kind contributions:
 * Adam Shand
 * Martin Krafft
 * Paweł Tęcza
+* Mick Pollard
+* Nico Schottelius
+* Jon Dowland
+* Amitai Schlair
 
 (Note that this page is locked to prevent anyone from tampering with the PayPal button.
 If you prefer your donation *not* be listed here, let [[Joey]] know.)