commit 2716d290e83e4643fa47f051636824ab351be327
parent f9678fe2258bf4f266610c3e8475e027b6f1ba46
Author: Stefan Kügel <skuegel@web.de>
Date: Sun, 15 Dec 2024 06:40:22 +0100
Merge branch 'master' into stable
Diffstat:
4 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/static/taler-systems-nightly.gpg b/static/taler-systems-nightly.gpg
Binary files differ.
diff --git a/static/taler-systems-nightly.gpg.key b/static/taler-systems-nightly.gpg.key
@@ -9,17 +9,17 @@ W/tPTmD2rNQqbFXRalIdIIJo2I4h33XekEZKdRcrd9R44h57vWdxZP7QWx5IhiI6
Obacm9u3eQ/HzK+O0yOiFNWGBxI4m12++9vRSiWr/wmkGq9ePBzXXXlbDNKPLjGd
UIAK6k+ORbli8c14OofNhgo6LAkWTZR+6DnRAxte8T858EgsX1PvoYCMW72G6Qua
qSniIXLE7XyL/vkAEQEAAbQ1VGFsZXIgUGFja2FnaW5nIE5pZ2h0bHkgPHBhY2th
-Z2luZy1uaWdodGx5QHRhbGVyLm5ldD6JAdQEEwEKAD4WIQR5Q15yJvS9UzLWV6xh
-u4UcGE9EzwUCYYKc0AIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAK
-CRBhu4UcGE9Ez1V9C/453bky9cGXsp85/bS94sgAfKDw4mKS7vulug8KIqbVJujw
-4YQWkGab+PuPaw5FwX/vvY5ZeioBiooIC0H0CGCIa89uuX9i8/nkxTMkM6+PDv4K
-q95tjwg7WJ1Zy2nNaliyJON9Ltam6PI274BA196YgQnyX3eeTaPEm0YoDV7D1U2r
-tORsTLVsi/DjODcTFI9EmUOKn90N+YamygUmEIe0NjYtMYxEVW9eiutozH60XULI
-sHXLPmbHjl+XhQlK9K2TDoEQcuqpq/38SLpCjMMLuHXEV864/HxM5fEQPNsKhRG/
-0t7GVII1BrU8duuKklBw3ylOrofDUlPE/XETfQhoxNIUEqSU9g5AZmL9+pir76J+
-FB2YNt361ig412qFW9h2M5uOWCQ/rwziACEhIHM0Vi1wqa9c8G1cA/pDesQp2S/z
-EMALuAdFyyWfZGVwYJd9jtsYKnKq0NUWtK2+IvpxArj9ddIWGupzfDor4qC2GXp/
-a61W+K4M3l4uxDvf8+i5AY0EYYKc0AEMANqolEuwKQP79l9NYaHoquJnNg2clhDV
+Z2luZy1uaWdodGx5QHRhbGVyLm5ldD6JAdQEEwEKAD4CGwMFCwkIBwIGFQoJCAsC
+BBYCAwECHgECF4AWIQR5Q15yJvS9UzLWV6xhu4UcGE9EzwUCZ0Q+pwUJCYQI1wAK
+CRBhu4UcGE9Ez0yiC/41dr4Woe5Zfsab8LZX0yyoe8XVUM1pZqLUYppYTAR7YvWJ
+/kX+acNgQRmJqGrfet/oDmbeSmVfZb6WoqyDFhV0mRyX4l79HkyQl/IgXvdj3xvz
+mWpNZiKmM18RqEjxLJDmcDl+1F8NiPA7dU4cBBjQeUkXAN4fu67+ONCMSIJn8OXk
+qOsX0knmgy7wT2BZQ2GNch3/+KgTwiKT+uHepFnEnzVp8aIxrIMlgn5GbkGoUB4y
+KaV7H1XeFMrqvRB7xvTvnkjEpjCEpRlhTkC/qrlLydyqCnr14+CJhhulpA/GjKr/
+HeiKXYao20ZAVuh7C3Y7f2VySIa6ffLHs6tyNPHHPXVcEZJYk6QIEmaf09Tlc7K2
+njYC8o+VYuukG1LDZ7HJVykvAvlvjAhO3gjNl+wPl8BT8na+evYArs6ISoW7yav8
+UCu0uKXGuk4U+t/W3Cor24+oqnKsgP3rhn1QYSu5hdGKWlA6LZ9DkUJr4qx5mVfT
+Xlhr+0smmG/xQ1Ee80O5AY0EYYKc0AEMANqolEuwKQP79l9NYaHoquJnNg2clhDV
PrCJHGgyERhDpq25TRKkRFwyi4q5kZnKfum3CqHqj1i+1espuGcz1KHtox4uQLgI
9izmAae6a9az2XUuG2snJntD3I2YwAlnLMky7MeqzcPODbfehIzxGETCNYPVbD66
ZhOPLknZsbHl0CxFLisQLaPxplsKPQAqoXZ5NnuwZGpIMS/5st5irxjGnasSmBOQ
@@ -27,15 +27,15 @@ uDeaLkVd+Lsxeg6Dwde5LqStJdlfjtwLq5k4T7WH3vS/g1JLQR1DD/rBOE08/7u/
3JvsUk8SSWD9EEoC92V2Y4MKgXov+heo5RlsjZNtyMIUULOm8OYRYJDf6h23rdNC
VAOrbTUTXTvb5DMY+ywTBJ6MqMl6QoEikctFvCuxpA2of+uAs8dmqy1Bxh++EcQO
sS9JR8JO2f+I6h+PxyyVeKIArWoQa9YnQ5t7ddTet1YlOZTMOc0HmGCoSSrU1yzv
-Dr9qm7YzmJSzn9ceshXzxzLVGl9kFvrrYQARAQABiQG8BBgBCgAmFiEEeUNecib0
-vVMy1lesYbuFHBhPRM8FAmGCnNACGwwFCQPCZwAACgkQYbuFHBhPRM/ZOgv8C2oN
-tstIiTxDoEYJ6hrmBW5ZyBZqTlkCyy2JELfPm5tkH6JD8iON4PB/RgIgdm4n1HSa
-s6a4rO3I7dSTqOCdUB42NsnQKIwOwq/kheKOV6Bth79e4xhy+K10sL55fh0VLznn
-cIAw2zlhKicjPUUXmWAC59uFOJjTPoXz7q5x76koZJK5bQuuMGay1UzRoLeO/TNR
-6l4QRY5rxGWc3q51ptN9LOXvpGOPBVF+NZWMpv4ha4Ov9z1hRjbrF37VMFNf4aDv
-tDXNIol0jzs/bQPrCglsoDo59HTwsS+NJs6EcCxuSe5TGOkpjt7lBcfUAUju+XXW
-H86bIkCZXrAHt4iJ6KQ1OqT4JtYImMJ+KnykDvlq9LKNZru52hsEos/wb45/x3N9
-dfYfLEIXZN6DBDgEiBHcTe5IfLqGqVF63SDamoKrghj3ldnAHE+TV/c0PBI6TtXa
-HzAshM+4W0MQf1UQqbeY3U7pd+bK8PUvE+KLf0eUhkf/sh5W+swyl1J7BOnf
-=R+Ma
+Dr9qm7YzmJSzn9ceshXzxzLVGl9kFvrrYQARAQABiQG8BBgBCgAmAhsMFiEEeUNe
+cib0vVMy1lesYbuFHBhPRM8FAmdEPrMFCQmECOMACgkQYbuFHBhPRM/u8wwAxEHl
+af0HgMJDhoCd8qe3oa4ADyVVL76adnVFmkPiDx9pWxwtawCPOVpewb/oRld/ngUw
+BeVbiOlA9lRPeOxO6DUawe/Ir3Cqfi+qXCHxL2wji9GQ6NLTAuF2+AtWiKJEDJtY
+OSJJtjVafulEmbpyVHGaHPB7RKVno3jT1fNbuApw1YsSdAZ9TgqcgexCHDfAyuw3
+3ZNVwTRLLDZK2nPk7MtrSeiHFRjshQdwR2d1jvNNvU9X0NfnKE7IS1DM/fI4YRHy
+Uw6iXS8dE7g2hTAQGw6v+gpHpzol9rO63c1LDMKnAcV0fqyuenN2avh5ji1XyNnf
+vkzinx6m3BmhxcMZARQMrCyI0elkXFtbvzFsph6h7PuO3aRP54ot12Uuz033wbh4
+OwtvNeMEivLzxlNf9qfJinz0bt1xDn8qkPmtXyU/xYv7R0jz8cXGEIPvR+Ac7Bkg
++jVHX9DR9tqyCNV+jV8XWzrPOmU0Q1K6noU0s52bAdPhHXs1Q4QeR7Iqayff
+=vnZb
-----END PGP PUBLIC KEY BLOCK-----
diff --git a/template/ngi-taler.html.j2 b/template/ngi-taler.html.j2
@@ -57,8 +57,10 @@
<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> and October 1<sup>st</sup>.
- <b>The fourth call of NGI TALER</b> opened up on October 1<sup>st</sup> with a deadline of <b>December 1<sup>st</sup> 2024 (12:00 CEST)</b>.
+ 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 fifth call of NGI TALER</b> opened up on December 1<sup>st</sup> with a deadline of <b>February 1<sup>st</sup> 2025 (12:00
+CEST)</b>.
You can find more information at the <a href="https://nlnet.nl/taler">Open Calls</a> page and
get feedback and support at the <a href="https://ich.taler.net/pub/open-calls-helpdesk" target="_blank" rel="noopener noreferrer">
TALER Integration Community Hub</a>.
diff --git a/template/press.html.j2 b/template/press.html.j2
@@ -5,6 +5,7 @@
<h1>{{ _("GNU Taler in the Press")}}</h1>
<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>
<li><a href="https://zevedi.de/ngi-taler-und-die-zukunft-des-digitalen-bezahlens/">NGI Taler und die Zukunft des digitalen Bezahlens</a></li>
<li><a href="https://zevedi.de/security-through-obscurity-die-ezb-und-moegliche-design-probleme-des-digitalen-euro/">Security through obscurity?</a></li>
<li><a href="https://zevedi.de/efin-blog-anonymitaet-beim-geldausgeben-und-transparenz-bei-einkommen-das-taler-bezahlsystem/">„Anonymität beim Geldausgeben und Transparenz bei Einkommen“: Das Taler-Bezahlsystem</a></li>
