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

2022-03-28 16:22:28 +02:00
parent a4e1830b5f 30658924a8
commit f313bf3e97
24 changed files with 100 additions and 112 deletions
--- a/app/views/directories/index.html.haml
+++ b/app/views/directories/index.html.haml
@ -34,7 +34,7 @@
                = fa_icon('lock') if account.locked?
        - if account.note.present?
          .account-card__bio.emojify
-            = prerender_custom_emojis(html_aware_format(account.note, account.local?), account.emojis)
+            = prerender_custom_emojis(account_bio_format(account), account.emojis)
        - else
          .flex-spacer
        .account-card__actions