aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-09-26 17:27:37 +0200
committerChristian Grothoff <christian@grothoff.org>2016-09-26 17:27:37 +0200
commit546975aecc2fead77b578363a311be17f82f66fa (patch)
tree1d915c0b13fec67d52a157a46d4c99b206f39168
parent9fecdcab00dd95561e87ca7166ff45aade7400a1 (diff)
parentb1a0672b0f354ede2b64b8c4b4c9cec1a86740c6 (diff)
downloadwww-546975aecc2fead77b578363a311be17f82f66fa.tar.gz
www-546975aecc2fead77b578363a311be17f82f66fa.zip
Merge branch 'master' of git+ssh://taler.net/var/git/www
-rw-r--r--about.html16
1 files changed, 8 insertions, 8 deletions
diff --git a/about.html b/about.html
index db0d8386..0bd7054e 100644
--- a/about.html
+++ b/about.html
@@ -92,11 +92,11 @@
92 <div class="col-lg-4"> 92 <div class="col-lg-4">
93 <h2><a href="https://fdold.eu">Florian Dold</a></h2> 93 <h2><a href="https://fdold.eu">Florian Dold</a></h2>
94 <img src="team-images/florian-dold.jpg" height=240 alt="Florian Dold" align="middle"> 94 <img src="team-images/florian-dold.jpg" height=240 alt="Florian Dold" align="middle">
95 <p lang="en">PhD Student, Inria. Hacker.</p> 95 <p lang="en">PhD Student, Inria..</p>
96 <p lang="de">Doktorand, Inria. Hacker.</p> 96 <p lang="de">Doktorand, Inria.</p>
97 <p lang="fr" note="outdated">Fouineur</p> 97 <p lang="fr" note="outdated"></p>
98 <p lang="it" note="outdated">Hacker</p> 98 <p lang="it" note="outdated"></p>
99 <p lang="es" note="outdated">Hacker</p> 99 <p lang="es" note="outdated"></p>
100 </div> 100 </div>
101 <div class="col-lg-4"> 101 <div class="col-lg-4">
102 <h2>Marcello Stanisci</h2> 102 <h2>Marcello Stanisci</h2>
@@ -181,9 +181,9 @@
181 <h2><a href="https://www.sec.in.tum.de/julian-kirsch/">Julian Kirsch</a></h2> 181 <h2><a href="https://www.sec.in.tum.de/julian-kirsch/">Julian Kirsch</a></h2>
182 <p lang="en">PhD student, TU Munich. Currently teaching.</p> 182 <p lang="en">PhD student, TU Munich. Currently teaching.</p>
183 <p lang="de">Doktorand, TU M&uuml;nchen. Currently teaching.</p> 183 <p lang="de">Doktorand, TU M&uuml;nchen. Currently teaching.</p>
184 <p lang="fr" note="outdated">Pirate Linux, FreeBSD, sites Web et en état profond de détente.</p> 184 <p lang="fr" note="outdated">Linux, FreeBSD, sites Web et en état profond de détente.</p>
185 <p lang="it" note="outdated">Hackera Linux, FreeBSD, siti web e il deep state nel tempo libero.</p> 185 <p lang="it" note="outdated">Linux, FreeBSD, siti web e il deep state nel tempo libero.</p>
186 <p lang="es" note="outdated">Hackea Linux, FreeBSD, sitios web y el gobierno en las sombras, en su tiempo libre.</p> 186 <p lang="es" note="outdated">Linux, FreeBSD, sitios web y el gobierno en las sombras, en su tiempo libre.</p>
187 </div> 187 </div>
188 </div> 188 </div>
189 <!--# include file="common/footer.inc" --> 189 <!--# include file="common/footer.inc" -->