From d54e608b7943937e333247279e8bde0802eadc6e Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 26 Aug 2016 00:10:28 +0200
Subject: adding florian

---
 about.html                   |   1 +
 common/header.inc            |   2 +-
 team-images/florian-dold.jpg | Bin 0 -> 17301 bytes
 web-common                   |   2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 team-images/florian-dold.jpg

diff --git a/about.html b/about.html
index 3d39d421..f678f421 100644
--- a/about.html
+++ b/about.html
@@ -91,6 +91,7 @@
         </div>
         <div class="col-lg-4">
           <h2><a href="https://fdold.eu">Florian Dold</a></h2>
+ 	  <img src="team-images/florian-dold.jpg" height=150 alt="Florian Dold" align="middle">
           <p lang="en">PhD Student, Inria. Hacker.</p>
           <p lang="de">Doktorand, Inria. Hacker.</p>
           <p lang="fr" note="outdated">Fouineur</p>
diff --git a/common/header.inc b/common/header.inc
index 11d92f51..560e3fdd 100644
--- a/common/header.inc
+++ b/common/header.inc
@@ -3,7 +3,7 @@
         @licstart  The following is the entire license notice for the
         JavaScript code in this page.
 
-        Copyright (C) 2014,2015 GNUnet e.V.
+        Copyright (C) 2014, 2015, 2016 GNUnet e.V.
 
         The JavaScript code in this page is free software: you can
         redistribute it and/or modify it under the terms of the GNU
diff --git a/team-images/florian-dold.jpg b/team-images/florian-dold.jpg
new file mode 100644
index 00000000..d5ddd3b1
Binary files /dev/null and b/team-images/florian-dold.jpg differ
diff --git a/web-common b/web-common
index dfa82524..80f1e270 160000
--- a/web-common
+++ b/web-common
@@ -1 +1 @@
-Subproject commit dfa825243b718e222013d35a58b2dd8ec0ef05ac
+Subproject commit 80f1e2708dbe4b19349244b611a6167b4b7a98c9
-- 
cgit v1.2.3