Merge remote-tracking branch 'parent/main' into kbtopic-remove-quote

2025-06-12 10:17:21 +09:00 · 2025-06-12 10:17:21 +09:00 · f3c3ea42c2
commit f3c3ea42c2
parent ebdb80168e 3aed93711c
301 changed files with 6618 additions and 3070 deletions
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@ -624,11 +624,11 @@ class Status extends ImmutablePureComponent {
                  {...statusContentProps}
                />

-                {children}
-
                {media}
                {hashtagBar}
                {emojiReactionsBar}
+
+                {children}
              </>
            )}