summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2019-09-21 15:11:22 +0200
committerBernhard Fröhlich <bernhard@cacert.org>2019-09-21 15:11:22 +0200
commit24a9c4571ad06c112bd2d1af2925f9296d132274 (patch)
treec235a6feaca9f61ba650661e95bb7f619c14786a
parenta866d3f5379b144ac5c0ee05757db335f179f758 (diff)
parent26bf9f642a2f80d9c2e37f5548fa29fc67dbeb26 (diff)
downloadcacert-devel-24a9c4571ad06c112bd2d1af2925f9296d132274.tar.gz
cacert-devel-24a9c4571ad06c112bd2d1af2925f9296d132274.tar.xz
cacert-devel-24a9c4571ad06c112bd2d1af2925f9296d132274.zip
Merge branch 'bug-1440' into test-1442
-rw-r--r--includes/general_stuff.php1
-rw-r--r--pages/index/feed.rss1
2 files changed, 2 insertions, 0 deletions
diff --git a/includes/general_stuff.php b/includes/general_stuff.php
index 01e5e7f..6636449 100644
--- a/includes/general_stuff.php
+++ b/includes/general_stuff.php
@@ -135,6 +135,7 @@ if(!function_exists("showfooter"))
<div id="siteInfo">
<a href="//wiki.cacert.org/FAQ/AboutUs"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
<a href="/policy/PrivacyPolicy.html"><?=_("Privacy Policy")?></a> |
+ <a href="https://wiki.cacert.org/Privacy/EU-EEA-DataProtectionDeclaration"><?=_("EU-EEA-DataProtectionDeclaration")?></a> |
<a href="/index.php?id=51"><?=_("Mission Statement")?></a> | <a href="/index.php?id=11"><?=_("Contact Us")?></a> |
&copy;2002-<?=date("Y")?> <?=_("by CAcert")?></div>
</div>
diff --git a/pages/index/feed.rss b/pages/index/feed.rss
index fe81399..f7e07b7 100644
--- a/pages/index/feed.rss
+++ b/pages/index/feed.rss
@@ -15,6 +15,7 @@
Merged in children are bug-1442.
Additional changes:
+ 2019-09-21: Merged in bug-1440 (change link to data protection policy)
2019-07-26: Merged in bug-775 (2 years lifetime for all org certificates)
2019-05-14: Merged in post-installation changes in preparation of a follow-up
2019-03-31: Another change in bug-1305: removed sub-header