taler-www

commit 82b10b099c9290fc245cc49bd6a016551d545fb6
parent 3ec597e8932b530a0fd6a4768a044aa7785eb427
Author: Stefan Kügel <stefan.kuegel@taler.net>
Date:   Wed,  2 Apr 2025 21:47:19 +0200

Merge branch 'master' into stable

Diffstat:
M
template/ngi-taler.html.j2
 | 
4
++--
M
template/press.html.j2
 | 
4
++++

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/template/ngi-taler.html.j2 b/template/ngi-taler.html.j2
@@ -57,8 +57,8 @@
       <div class="col-md-11 col-md-4 mb-4 px-md-4">
         <p class="w-responsive mx-auto mb-3">
           NGI TALER has frequent open calls for funding to third parties.
-          The first deadline was April 1<sup>st</sup> 2024, followed by June 1<sup>st</sup>, October 1<sup>st</sup> and December 1<sup>st</sup>.
-          <b>The 6<sup>th</sup> call of NGI TALER</b> opened up on February 1<sup>st</sup> with a deadline of <b>April 1<sup>st</sup> 2025 (12:00 CET)</b>.
+          The first deadline was April 1<sup>st</sup> 2024, followed by June 1<sup>st</sup>, October 1<sup>st</sup>, December 1<sup>st</sup>, February 1<sup>st</sup> 2025, and April 1<sup>st</sup>.
+          <b>The 7<sup>th</sup> call of NGI TALER</b> opened up on April 1<sup>st</sup> with a deadline of <b>June 1<sup>st</sup> 2025 (12:00 CET)</b>.
           You can find more information at the <strong><a href="https://nlnet.nl/taler" target="_blank" rel="noopener noreferrer">Open Calls</a></strong> page and
           get feedback and support at the <strong><a href="https://ich.taler.net/pub/open-calls-helpdesk" target="_blank" rel="noopener noreferrer">
           TALER Integration Community Hub</a></strong>.
diff --git a/template/press.html.j2 b/template/press.html.j2
@@ -3,6 +3,10 @@
 <main id="maincontent">
   <div class="container">
     <h1>{{ _("GNU Taler in the Press")}}</h1>
+    <h2>{{ _("2025")}}</h2>
+    <ul>
+    <li><a href="https://magazin.comdirect.de/finanzwissen/konto-und-karten/was-ist-gnu-taler">Was ist GNU Taler?</a></li>
+    </ul>
     <h2>{{ _("2024")}}</h2>
     <ul>
     <li><a href="https://f-droid.org/2024/12/12/twif.html">Forks to the rescue - TWIF curated on Thursday, 12 Dec 2024, Week 50</a></li>