diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-26 21:15:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-26 21:15:19 +0100 |
| commit | 551820cbd9e5beebd16f16205143e2263d4f2d51 (patch) | |
| tree | 6868722efeb660c0031a22aecfdc4b2c5bc9dcc6 /app/views/admin/custom_emojis/_custom_emoji.html.haml | |
| parent | e48eaf64cc7cb0cfab388331c4823ee5fb580d59 (diff) | |
| parent | 67c6f37e269a4ebb538e019351f894183f3c1439 (diff) | |
Merge pull request #1704 from ClearlyClaire/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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/custom_emojis/_custom_emoji.html.haml b/app/views/admin/custom_emojis/_custom_emoji.html.haml index 526c844e9..41f3975cf 100644 --- a/app/views/admin/custom_emojis/_custom_emoji.html.haml +++ b/app/views/admin/custom_emojis/_custom_emoji.html.haml @@ -3,7 +3,7 @@ = f.check_box :custom_emoji_ids, { multiple: true, include_hidden: false }, custom_emoji.id .batch-table__row__content.batch-table__row__content--with-image .batch-table__row__content__image - = custom_emoji_tag(custom_emoji, animate = current_account&.user&.setting_auto_play_gif) + = custom_emoji_tag(custom_emoji, current_account&.user&.setting_auto_play_gif) .batch-table__row__content__text %samp= ":#{custom_emoji.shortcode}:" |