Merge commit 'fd284311e7' into kb_migration

This commit is contained in:
KMY 2023-08-01 17:59:16 +09:00
commit 287eacf5f3
400 changed files with 4667 additions and 5387 deletions

View file

@ -9,7 +9,7 @@
%samp= ":#{custom_emoji.shortcode}:"
- if custom_emoji.local?
%span.account-role.bot= custom_emoji.category&.name || t('admin.custom_emojis.uncategorized')
%span.information-badge= custom_emoji.category&.name || t('admin.custom_emojis.uncategorized')
%br/
%span= custom_emoji.aliases_raw