Merge remote-tracking branch 'parent/stable-4.3' into kb-draft-15.12-lts

2025-04-03 06:38:45 +09:00 · 2025-04-03 06:38:45 +09:00 · 97647cbbc0
commit 97647cbbc0
parent 2f69bed4cd 6f16011c5a
108 changed files with 1729 additions and 1018 deletions
--- a/app/javascript/mastodon/features/favourited_statuses/index.jsx
+++ b/app/javascript/mastodon/features/favourited_statuses/index.jsx
@ -101,6 +101,7 @@ class Favourites extends ImmutablePureComponent {
          onLoadMore={this.handleLoadMore}
          emptyMessage={emptyMessage}
          bindToDocument={!multiColumn}
+          timelineId='favourites'
        />

        <Helmet>