[git] gnupg-doc - branch, master, updated. 6d5ebbb843ac68a3b280baa78eaf329b55fd980c

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  6d5ebbb843ac68a3b280baa78eaf329b55fd980c (commit)
      from  1dcfa0399c627d2cb4daa0ee440dd90aab5aad87 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6d5ebbb843ac68a3b280baa78eaf329b55fd980c
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 16 19:25:25 2015 +0200

    web: Add note about data retention act.

diff --git a/web/misc/vds_timeline-300x150.png b/web/misc/vds_timeline-300x150.png
new file mode 100644
index 0000000..9bbca41
Binary files /dev/null and b/web/misc/vds_timeline-300x150.png differ
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index 55402fb..d8ef81e 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -294,6 +294,8 @@ string of the source file or nil if not available."
   <ul>
 ")
     (gpgweb--insert-menu gpgweb-gnupg-bottom-menu-alist 0 nil)
+    (insert "  <li>
+<a href=\"https://netzpolitik.org\"><img src=\"misc/vds_timeline-300x150.png\" title=\"Germany parliament again adopts data retention act - after the German (in 2010) and the European supreme court (in 2014) nixed such acts.\"></a></li>")
     (insert "  </ul>
   </div>
 ")

-----------------------------------------------------------------------

Summary of changes:
 web/misc/vds_timeline-300x150.png | Bin 0 -> 29670 bytes
 web/share/gpgweb.el               |   2 ++
 2 files changed, 2 insertions(+)
 create mode 100644 web/misc/vds_timeline-300x150.png


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org