Merge branch 'release/0.5.4.0' into stable

This commit is contained in:
Dennis Schubert 2015-10-19 18:49:08 -07:00
commit 1f4ad4019f

View file

@ -1,19 +1,19 @@
<div class="container" style="position:relative;">
<a href="/stream" rel="backbone" data-stream-title="{{t "my_stream"}}">
<a href="/stream" data-stream-title="{{t "my_stream"}}">
<div alt="logo" class="diaspora_header_logo logos-header-logo">
</div>
</a>
<span class="header-nav">
<span>
<a href="/stream" rel="backbone">
<a href="/stream">
{{t "my_stream"}}
</a>
</span>
<span>
<a href="/activity" rel="backbone">
<a href="/activity">
{{t "my_activity"}}
</a>
</span>