Merge branch 'master' into glitch-soc/merge-upstream

2020-08-13 22:17:29 +02:00
parent 660188c900 0f38f9726a
commit da62e350e0
14 changed files with 72 additions and 30 deletions
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -17,7 +17,7 @@
        %span.display-name
          %bdi
            %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay)
-          &nbsp;
+          = ' '
          %span.display-name__account
            = acct(status.account)
            = fa_icon('lock') if status.account.locked?