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:
Jonne Haß 2015-05-21 00:46:59 +02:00
commit 9b7a3c86e6
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/assets/templates/status-message_tpl.jst.hbs
View file

@ -18,12 +18,16 @@
<div class="markdown-content">
{{#if text}}
{{{text}}}
{{else if isReshare}}
<div class="reshare">
<p>
{{t "stream.original_post_deleted"}}
</p>
</div>
{{else}}
{{#unless largePhoto}}
{{#if isReshare}}
<div class="reshare">
<p>
{{t "stream.original_post_deleted"}}
</p>
</div>
{{/if}}
{{/unless}}
{{/if}}
</div>
<div class="oembed"></div>