Merge remote-tracking branch 'parent/main' into upstream-20240610

2024-06-10 08:19:27 +09:00 · 2024-06-10 08:19:27 +09:00 · 90f2ea9015
commit 90f2ea9015
parent aac7bd31f7 827e36ff9e
125 changed files with 2266 additions and 1504 deletions
--- a/app/javascript/mastodon/features/account_timeline/index.jsx
+++ b/app/javascript/mastodon/features/account_timeline/index.jsx
@ -199,6 +199,7 @@ class AccountTimeline extends ImmutablePureComponent {
          emptyMessage={emptyMessage}
          bindToDocument={!multiColumn}
          timelineId='account'
+          withCounters
        />
      </Column>
    );