diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-07-29 21:54:57 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-07-29 21:54:57 +0200 |
commit | 83d6043ba3fb3eb25f489f5a10db7778055ae617 (patch) | |
tree | 855c818d3ca9f00d03516f8cfb8b11f9f0ee447a /press.html.j2 | |
parent | e773fff8a353488d54b394f6926721ccd8f6ae18 (diff) | |
parent | bdc1672325bcd3649c02f9936d2681230a389b7c (diff) | |
download | www-83d6043ba3fb3eb25f489f5a10db7778055ae617.tar.gz www-83d6043ba3fb3eb25f489f5a10db7778055ae617.tar.bz2 www-83d6043ba3fb3eb25f489f5a10db7778055ae617.zip |
resolving merge conflicts
Diffstat (limited to 'press.html.j2')
-rw-r--r-- | press.html.j2 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/press.html.j2 b/press.html.j2 index 5a3b7fc9..928f94d7 100644 --- a/press.html.j2 +++ b/press.html.j2 @@ -8,6 +8,7 @@ <ul> <li><a href="http://hackerpublicradio.org/eps.php?id=2222">Hacker Public Radio</a></li> <li><a href="https://www.secupay.com/de/Node/932">Secupay</a></li> + <li><a href="https://www.developpez.com/actu/142082/Taler-le-systeme-de-paiement-electronique-anonyme-developpe-par-GNU-et-l-INRIA-passe-en-version-0-3-0/">Developpez.com</a></li> </ul> </p> |