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

2025-03-28 08:44:30 +09:00 · 2025-03-28 08:44:30 +09:00 · 12ed20b6d5
commit 12ed20b6d5
parent a24031b527 0479efdbb6
257 changed files with 3505 additions and 2010 deletions
--- a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
+++ b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
@ -101,6 +101,7 @@ class Bookmarks extends ImmutablePureComponent {
          onLoadMore={this.handleLoadMore}
          emptyMessage={emptyMessage}
          bindToDocument={!multiColumn}
+          timelineId='bookmarks'
        />

        <Helmet>