diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-12-09 13:28:09 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-12-09 16:08:04 +0100 |
commit | e7f1bfdc2d528f137299ba0c3ab2a30f2f91f53c (patch) | |
tree | 2693ffce4d340a9b77a7ca52c856aaae7af8c913 /app/views/application/_card.html.haml | |
parent | e3682c9c1750e5e7e5d2f817e29f6760a18400ca (diff) | |
parent | 81bda7d67c984c9bfcb5bca94e50cec6405b492e (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.
Diffstat (limited to 'app/views/application/_card.html.haml')
-rw-r--r-- | app/views/application/_card.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/application/_card.html.haml b/app/views/application/_card.html.haml index 9cf8f8ff2..e6059b035 100644 --- a/app/views/application/_card.html.haml +++ b/app/views/application/_card.html.haml @@ -9,6 +9,7 @@ = image_tag account.avatar.url, alt: '', width: 48, height: 48, class: 'u-photo' .display-name + %span{id: "default_account_display_name", style: "display:none;"}= account.username %bdi %strong.emojify.p-name= display_name(account, custom_emojify: true) %span |