diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-29 16:39:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 16:39:43 +0200 |
| commit | eaea849035ea407afb2d5db411dbddc1ccca6f44 (patch) | |
| tree | 19a0b6e761fc453fac2f5a8aba24595ad93f0382 /app/views/directories | |
| parent | 2287eebae0c1d699436a8cf3218d7cfe990a3605 (diff) | |
| parent | 8d6f3f8a379c8d552d2101cf35ae8f6fe956da53 (diff) | |
Merge pull request #1724 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/directories')
| -rw-r--r-- | app/views/directories/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/directories/index.html.haml b/app/views/directories/index.html.haml index 2ac700fe6..4872432d4 100644 --- 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 - = Formatter.instance.simplified_format(account, custom_emojify: true) + = prerender_custom_emojis(account_bio_format(account), account.emojis) - else .flex-spacer .account-card__actions |