とりあえず
0f07e1cd4c (upstream/main) Fix yarn.lock diff (#30366)
0a343b9a91 fix(deps): update react monorepo to v18.3.1 (#30074)
a178ba7cd5 Use a modern React context for identity in the app (#30098)
6282b6da77 Fix og:image requests when html in a web page is over 1.megabyte (#30362)
CONFLICT (content): Merge conflict in app/javascript/mastodon/features/account/components/header.jsx
\Master?/ \ますたー/
Merged mastodon/mastodon at 0f07e1cd4cf04049eda34d4dfd98c12fafc5e344.
@zundan ダジャレを検出しました(検出ワード: CONFLICT)