Merge remote-tracking branch 'upstream/master'

interim merge for commit (hooking up contact form)
This commit is contained in:
Madeleine Shang 2017-02-05 22:46:26 +00:00
commit 15aeb408c6
8 changed files with 3 additions and 3 deletions

View file

@ -13,7 +13,7 @@
<li class="overlay-menu__item"><a href="{{ basenav }}/community/" class="overlay-menu__link">{% t nav.community %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/team" class="overlay-menu__link">{% t nav.team %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/blog/" class="overlay-menu__link">{% t nav.blog %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/evolution/" class="overlay-menu__link">{% t nav.evolution %}</a></li>
{% if page.layout != 'post' %}
<li class="overlay-menu__item overlay-menu__item--languages">
<ul class="overlay-menu__sublist">