Merge branch 'careteam' of eal/fsfe-website into master
the build was successful

This commit was merged in pull request #352.
This commit is contained in:
eal
2018-06-19 17:26:15 +02:00
committed by Gogs
+2 -4
View File
@@ -20,8 +20,7 @@ href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=vindex&search=eal%4
<img alt="Jan-Christoph Borchardt"
src="/about/borchardt/borchardt-avatar.jpg" />
<span class="name">Jan-Christoph Borchardt</span>
<span class="email"><a href="mailto:hey@jancborchardt.net">hey
(at) jancborchardt (dot) net</a> (<a
<span class="email"><a href="mailto:jancborchardt@fsfe.org">jancborchardt (at) fsfe (dot) org</a> (<a
href="https://keybase.io/jancborchardt/pgp_keys.asc?fingerprint=ecd0c4a3a2fc72b354e4fc78cbd846fc845cbe17">PGP</a>)</span>
<span class="languages">Speaks: English, German</span>
</p>
@@ -32,8 +31,7 @@ href="https://keybase.io/jancborchardt/pgp_keys.asc?fingerprint=ecd0c4a3a2fc72b3
<img alt="Lucile Falgueyrac"
src="/about/falgueyrac/lucile-falgueyrac-avatar.jpg" />
<span class="name">Lucile Falgueyrac</span>
<span class="email"><a href="mailto:lucilefalg@tila.im">lucilefalg
(at) tila (dot) im</a> (<a
<span class="email"><a href="mailto:lucile.falg@fsfe.org">lucile.falg (at) fsfe (dot) org</a> (<a
href="https://hkps.pool.sks-keyservers.net/pks/lookup?op=get&amp;search=0x83E1D9A12C7FF2D5">PGP</a>)</span>
<span class="languages">Speaks: English, French, German</span>
</p>