nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2015-10-19 18:50:36 -07:00
commit 00ebe4963e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/templates/header_tpl.jst.hbs
View file

@ -9,7 +9,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="/stream" class="navbar-brand" rel="backbone" data-stream-title="{{t "my_stream"}}">
<a href="/stream" class="navbar-brand" data-stream-title="{{t "my_stream"}}">
{{ podname }}
</a>
<ul class="nav nav-badges visible-sm visible-xs">
@ -34,8 +34,8 @@
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-left">
<li><a href="/stream" rel="backbone">{{t "my_stream"}}</a></li>
<li><a href="/activity" rel="backbone">{{t "my_activity"}}</a></li>
<li><a href="/stream">{{t "my_stream"}}</a></li>
<li><a href="/activity">{{t "my_activity"}}</a></li>
<li class="visible-sm visible-xs"><a href="/mobile/toggle">{{t "header.toggle_mobile"}}</a></li>
</ul>