The branch, master has been updated via 082905f3d84eb3994ed3880e1f5bc680684f4d4c (commit) via 06be6e99cadee5555fd623cd8d456d414be96bd2 (commit) via c61c1cf251c58b7d1dc466a3050ca9d5c4e04943 (commit) from de7b3b65b1a15502059fa18c45dc757bcba7d4d6 (commit)

- Log ----------------------------------------------------------------- commit 082905f3d84eb3994ed3880e1f5bc680684f4d4c Author: Michal Čihař mcihar@suse.cz Date: Thu Jan 12 08:57:29 2012 +0100

Describe Flattr

commit 06be6e99cadee5555fd623cd8d456d414be96bd2 Author: Michal Čihař mcihar@suse.cz Date: Thu Jan 12 08:54:55 2012 +0100

Mention that PayPal accepts credit cards

commit c61c1cf251c58b7d1dc466a3050ca9d5c4e04943 Author: Michal Čihař mcihar@suse.cz Date: Thu Jan 12 08:53:41 2012 +0100

Mention how we use the funds

-----------------------------------------------------------------------

Summary of changes: templates/donate.tpl | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/templates/donate.tpl b/templates/donate.tpl index 9efd06f..ec2231e 100644 --- a/templates/donate.tpl +++ b/templates/donate.tpl @@ -7,10 +7,20 @@ <div py:match="content" id="body"> <h2>Donations</h2> <p> -We invite you to <a href="https://sourceforge.net/donate/index.php?group_id=23067" rel="payment">contribute money</a> to our project (or just send money using PayPal to donate@phpmyadmin.net). +As an free software project, phpMyAdmin has almost no revenues itself. On the +other side, we have some expenses. Currently most of project funds are used +for travel costs for team members to allow them attend various conferences. </p> <p> -Alternatively you can appreciate our work using <a href="https://flattr.com/thing/56976/phpMyAdmin">Flattr</a>. +We invite you to <a href="https://sourceforge.net/donate/index.php?group_id=23067" rel="payment">contribute money</a> +to our project (or just send money using PayPal to donate@phpmyadmin.net). +PayPal is one of most used online payments methods, it also accepts all major +credit cards. +</p> +<p> +Alternatively you can appreciate our work using +<a href="https://flattr.com/thing/56976/phpMyAdmin">Flattr</a>. Flattr is a +microdonation system allowing users to easily appreciate others. </p> <p> Donations will be used for the promotion of phpMyAdmin, mostly by allowing team members to visit various conferences. Thanks.

hooks/post-receive