Merge tag 'v3.1.4' into hometown-dev

2020-05-15 15:34:04 -07:00
parent 1d70261350 c9dcc2d39f
commit 877a478466
1182 changed files with 15087 additions and 6745 deletions
--- a/app/views/application/_card.html.haml
+++ b/app/views/application/_card.html.haml
@ -9,7 +9,6 @@
        = 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