Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Mark Pitman 2015-07-12 19:45:14 -07:00
commit 9f394ed30a
2 changed files with 6 additions and 0 deletions

View File

@ -44,6 +44,7 @@ copyright = "© Copyright notice"
googleplus = "Your Google+ user id"
facebook = "Your Facebook username"
stackoverflow = "Your Stackoverflow user id (number)"
keybase = "Your keybase.io username"
# Google Analytics API key.
ga_api_key = "Your Google Analytics tracking id"
# Mixpanel API key.

View File

@ -34,4 +34,9 @@
<i class="fa fa-linkedin"></i>
</a>
{{ end }}
{{ with .Site.Params.keybase }}
<a href="https://keybase.io/{{ . }}" target="_blank">
<i class="fa fa-key"></i>
</a>
{{ end }}
</div>