summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2019-03-31 20:29:32 +0200
committerBernhard Fröhlich <bernhard@cacert.org>2019-03-31 20:29:32 +0200
commit42b1850e5f2f59265b6ca367245904e573a1dfc3 (patch)
treeab7b6e9bf1e6891b33e488505f2d1096494ea6cd
parent5d961742f0e1849eb3f438391c749cd2e92a2161 (diff)
parentda4c71a246b80f399f3a12823ac03fa8c40f42bb (diff)
downloadcacert-devel-42b1850e5f2f59265b6ca367245904e573a1dfc3.tar.gz
cacert-devel-42b1850e5f2f59265b6ca367245904e573a1dfc3.tar.xz
cacert-devel-42b1850e5f2f59265b6ca367245904e573a1dfc3.zip
Merge branch 'bug-1305' into test-1442
-rw-r--r--pages/index/3.php8
-rw-r--r--pages/index/feed.rss1
2 files changed, 8 insertions, 1 deletions
diff --git a/pages/index/3.php b/pages/index/3.php
index 19f0f52..f99d64c 100644
--- a/pages/index/3.php
+++ b/pages/index/3.php
@@ -46,8 +46,14 @@
</ul>
-<h4><?=_("PKI fingerprint signed by the CAcert GPG Key")?></h4>
<?php if ( false ) { ?>
+ /**
+ Since we don't seem to have a way to GPG sign our current key, we have, at least temporarily, removed this.
+
+ https://bugs.cacert.org/view.php?id=1305#c5784
+
+ **/
+<h4><?=_("PKI fingerprint signed by the CAcert GPG Key")?></h4>
<pre>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
diff --git a/pages/index/feed.rss b/pages/index/feed.rss
index abda8a4..3699bf6 100644
--- a/pages/index/feed.rss
+++ b/pages/index/feed.rss
@@ -15,6 +15,7 @@
Merged in children are bug-1442.
Additional changes:
+ 2019-03-31: Another change in bug-1305: removed sub-header
2019-03-31: Once more the changes of bug-1305 have been merged in
2019-03-12: Recent changes of Brian in bug-1305 (postal address in CAP/COAP forms) are now merged in
2019-03-01: Mail checking re-activated, improvements to error reporting