Merge remote-tracking branch 'parent/main' into kb-merge-231010

2023-10-10 22:17:15 +09:00 · 2023-10-10 22:17:15 +09:00 · 80498c8377
commit 80498c8377
parent 36ac9447b1 9d1c3d0678
45 changed files with 289 additions and 251 deletions
--- a/app/javascript/mastodon/features/reaction_deck/components/reaction_emoji.jsx
+++ b/app/javascript/mastodon/features/reaction_deck/components/reaction_emoji.jsx
@ -59,7 +59,7 @@ class ReactionEmoji extends ImmutablePureComponent {
      const html = { __html: emojify(emoji) };
      content = (
        <span dangerouslySetInnerHTML={html} />
-      )
+      );
    }

    return (