Merge branch 'master' of gh:tilde-team/site

This commit is contained in:
Ben Harris 2018-01-29 13:26:56 -05:00
commit 71f926b7ad
3 changed files with 2 additions and 4 deletions

File diff suppressed because one or more lines are too long

View File

@ -73,8 +73,6 @@
<i class="fa fa-comments"></i> ~discord~</a>
<a class="btn btn-default" href="https://github.com/tilde-team">
<i class="fa fa-github"></i> ~github-org~</a>
<a class="btn btn-default" href="https://git.tilde.team">
<i class="fa fa-git"></i> ~tildegit~</a>
<a class="btn btn-default" href="https://bhh.sh">
<i class="fa fa-link"></i> ~url-shortener~</a>
<a class="btn btn-default" href="https://social.tilde.team/">

View File

@ -1,5 +1,5 @@
{
"published": true,
"published": false,
"date": "jan 2018",
"title": "<a href=\"https://git.tilde.team\">tildegit</a>",
"author": "<a href=\"/~ben/\">~ben</a>",