Commit 35cf6d91 authored by Kamil Iskra's avatar Kamil Iskra
Browse files

Merge branch 'resurrect-eric' into 'master'

Move Eric Green back to current

See merge request !29
parents 06212023 7989d7b2
......@@ -11,6 +11,8 @@ permalink: /team/
{% include mugshot img="gokhale.jpg" alt="Maya Gokhale" caption="Maya Gokhale (co-PI)" %}
{% include mugshot img="green.jpg" alt="Eric Green" %}
{% include mugshot img="gupta.jpg" alt="Rinku Gupta" %}
{% include mugshot img="iskra.jpg" alt="Kamil Iskra" %}
......@@ -51,8 +53,6 @@ permalink: /team/
{% include mugshot img="gioiosa.jpg" alt="Roberto Gioiosa" %}
{% include mugshot img="green.jpg" alt="Eric Green" %}
{% include mugshot img="leon.jpg" alt="Edgar Leon" %}
{% include mugshot img="mcfadden.jpg" alt="Marty McFadden" %}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment