[www] branch master updated (2a5701a -> 5645dd9)

[gnunet]

This is an automated email from the git hooks/post-receive script.

nikita pushed a change to branch master
in repository www.

    from 2a5701a  gnurl: rewrite to be more rational about patch waiting times
     new 8e623df  mailmap update
     new 5645dd9  Add opengraph to header, most of it is TODO

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .mailmap             |  7 +++++--
 common/header.j2.inc | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 017cc9a..386cebe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,5 @@
-ng0 <address@hidden>
-ng0 <address@hidden> Nils Gillmann <address@hidden>
+nikita <address@hidden>
+nikita <address@hidden> address@hidden <address@hidden>
+nikita <address@hidden> ng0 <address@hidden>
+nikita <address@hidden> Nils Gillmann <address@hidden>
+nikita <address@hidden> Nils Gillmann <address@hidden>
diff --git a/common/header.j2.inc b/common/header.j2.inc
index 2f80985..9d797fe 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -56,3 +56,21 @@
     <![endif]-->
 
     <link rel="alternate" type="application/rss+xml" title="GNUnet.org rss" 
href="{{ url_localized('news/rss.xml') }}" />
+
+    <!-- opengraph -->
+    <!--
+      We do not actively use Twitter or endorse it, but people might
+      use our posts there or other websites might conform to the
+      twitter namespace of the opengraph. More opengraph must be
+      implemented in the sitecode.
+      -->
+    <meta name="twitter:card" content="article" />
+    <meta name="twitter:site" content="@gnunet" />
+    <meta name="twitter:creator" content="@gnunet" />
+    {#
+    TODO: Implement the necessary functions.
+    <meta property="og:url" content="{{ url_localized(url) }}" />
+    <meta property="og:title" content="{{ title }}" />
+    <meta property="og:description" content="{{ summary }}" />
+    <meta property="og:image" content="" />
+    #}

-- 
To stop receiving notification emails like this one, please contact
address@hidden.