diff options
| author | Bernhard Fröhlich <bernhard@cacert.org> | 2019-09-26 22:34:15 +0200 |
|---|---|---|
| committer | Bernhard Fröhlich <bernhard@cacert.org> | 2019-09-26 22:34:15 +0200 |
| commit | cb85dea12abda4657b14ad10f93da1ad559caf79 (patch) | |
| tree | 6588a5afb4baee309a019e9713ad02768ba43a01 | |
| parent | 0f4e48c756a6073b64c74e330a69d1be70d78221 (diff) | |
| parent | c056caf95ce634248b27822ce3ee9c40c0efc572 (diff) | |
| download | cacert-devel-test-1442.tar.gz cacert-devel-test-1442.tar.xz cacert-devel-test-1442.zip | |
Merge branch 'bug-1423' into test-1442test-1442
| -rw-r--r-- | includes/sponsorinfo.php | 1 | ||||
| -rw-r--r-- | pages/index/feed.rss | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/includes/sponsorinfo.php b/includes/sponsorinfo.php index 3ed216a..875b4bc 100644 --- a/includes/sponsorinfo.php +++ b/includes/sponsorinfo.php @@ -3,6 +3,5 @@ <a href="http://www.bit.nl/" target="_blank"><img class="sponsorlogo" src="/images/bit.png" alt="[BIT logo]" border="0"></a> <a href="http://www.tunix.nl/" target="_blank"><img class="sponsorlogo" src="/images/tunix.png" alt="[TUNIX logo]" border="0"></a> <a href="http://www.nlnet.nl/" target="_blank"><img class="sponsorlogo" src="/images/nlnet.png" alt="[NLnet logo]" border="0"></a> - <a href="http://www.openarchitecturenetwork.org/" target="_blank"><img class="sponsorlogo" src="/images/oan.png" alt="[OAN logo]" border="0"></a> </div> diff --git a/pages/index/feed.rss b/pages/index/feed.rss index f7e07b7..9a1385a 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-26: Merged in bug-1423 (remove link to Open Architecture Netword) 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 |