diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-11 15:28:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 15:28:06 +0200 |
| commit | d787bcdeb1570e4d8d67f326dadaf321a6854e06 (patch) | |
| tree | fa23a187b16bf07635312a7791013aacfc2c4474 /app/views/accounts/_header.html.haml | |
| parent | 03afc365d530e6d57754ae9dbbdbd0c56431ee02 (diff) | |
| parent | 7067b64de33f9cd491e97329df266fde5fb49e42 (diff) | |
Merge pull request #630 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/accounts/_header.html.haml')
| -rw-r--r-- | app/views/accounts/_header.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index e343be820..d3b9893c4 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -7,7 +7,7 @@ .public-account-header__tabs .public-account-header__tabs__name %h1 - = display_name(account) + = display_name(account, custom_emojify: true) %small = acct(account) = fa_icon('lock') if account.locked? |