adding florian

4 files changed, 2 insertions, 1 deletions

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
--- /dev/null
+++ b/team-images/florian-dold.jpg
diff --git a/web-common b/web-common
-Subproject dfa825243b718e222013d35a58b2dd8ec0ef05a
+Subproject 80f1e2708dbe4b19349244b611a6167b4b7a98c