diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-10 00:28:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-10 00:28:54 +0200 |
| commit | 34142ab29c33104793afe3199f102d84b83b9b57 (patch) | |
| tree | afba23a3f169d7445f80ffe555985a295c98f6e1 /app/views/stream_entries/_detailed_status.html.haml | |
| parent | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff) | |
| parent | 5d8052e7156c913a551b923c51d508b1ea8837b3 (diff) | |
Merge pull request #472 from ThibG/glitch-soc/merge
Merge upstream changes
Diffstat (limited to 'app/views/stream_entries/_detailed_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index afc66d148..c0f1e4f0f 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -4,7 +4,7 @@ .avatar = image_tag status.account.avatar.url(:original), width: 48, height: 48, alt: '', class: 'u-photo' %span.display-name - %strong.p-name.emojify= display_name(status.account) + %strong.p-name.emojify= display_name(status.account, custom_emojify: true) %span= acct(status.account) - if embedded_view? |