Merge branch 'fix-it-up' of tildeverse/journal into master

This commit is contained in:
Ben Harris 2018-12-09 03:42:23 -05:00 committed by Gitea
commit f9094a0524
2 changed files with 2 additions and 2 deletions

View File

@ -5,7 +5,7 @@
?> ?>
<h1 class="page-header">Charter</h1> <h1 class="page-header">Charter</h1>
<p>The Intentional Journal of the Tildeverse is an open journal for members of any tilde box (i.e; <a href="//tilde.town">tilde.town</a>, <a href="//tilde.team">tilde.team</a>, <p>The Intentional Journal of the Tildeverse is an open journal for members of any tilde box (i.e; <a href="//tilde.town">tilde.town</a>, <a href="//tilde.team">tilde.team</a>,
<a href="//yourtilde.com">yourtilde.com</a>, <a href="//tilde.fun">tilde.fun</a>, etc.) to describe research and results of projects. Papers published should be long-formed essays as <a href="//yourtilde.com">yourtilde.com</a>, etc.) to describe research and results of projects. Papers published should be long-formed essays as
opposed to short-form declarations, and can be on any topic of pure interest to the author, as long as there is non-commercial opposed to short-form declarations, and can be on any topic of pure interest to the author, as long as there is non-commercial
motivation to explore and learn more about a topic. In addition to publishing tilde members' papers, we also operate as a social motivation to explore and learn more about a topic. In addition to publishing tilde members' papers, we also operate as a social
space where members can participate in many ways, including (but not limited to) reviewing papers and providing constructive space where members can participate in many ways, including (but not limited to) reviewing papers and providing constructive

View File

@ -17,7 +17,7 @@
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="https://journal.tildeverse.org/charter.php"><i class="fa fa-file-text"></i> charter</a></li> <li><a href="https://journal.tildeverse.org/charter.php"><i class="fa fa-file-text"></i> charter</a></li>
<li><a href="https://web.tilde.chat/?join=journal"><i class="fa fa-comments-o"></i> IRC chatroom</a></li> <li><a href="https://web.tilde.chat/?join=journal"><i class="fa fa-comments-o"></i> IRC chatroom</a></li>
<li><a href="https://git.tildeverse.org/tildeverse/journal"><i class="fa fa-code-fork"></i> git</a></li> <li><a href="https://tildegit.org/tildeverse/journal"><i class="fa fa-code-fork"></i> git</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>