diff options
author | ThibG <thib@sitedethib.com> | 2019-10-11 22:28:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-11 22:28:11 +0200 |
commit | ef925f31a66d1cbc95bff11669d05e2924d8ce85 (patch) | |
tree | aadbb60d22a196075fe1faaeeae169e5badead57 /app/views/admin/custom_emojis/_custom_emoji.html.haml | |
parent | b3dd0d276d52042828e11bf325015f5d7f4624ca (diff) | |
parent | 877e8c9d799eae663526609642e0c0c9a4612bda (diff) |
Merge pull request #1233 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/custom_emojis/_custom_emoji.html.haml')
-rw-r--r-- | app/views/admin/custom_emojis/_custom_emoji.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/admin/custom_emojis/_custom_emoji.html.haml b/app/views/admin/custom_emojis/_custom_emoji.html.haml index 2103b0fa7..526c844e9 100644 --- a/app/views/admin/custom_emojis/_custom_emoji.html.haml +++ b/app/views/admin/custom_emojis/_custom_emoji.html.haml @@ -17,6 +17,10 @@ - else = custom_emoji.domain + - if custom_emoji.local_counterpart.present? + • + = t('admin.accounts.location.local') + %br/ - if custom_emoji.disabled? |