コード更新しとこ
4fe2d7cb5 (upstream/main) Fix HTTP 500 in `/api/v1/emails/check_confirmation` (#25595)
cea9db5a0 Change local and federated timelines to be in a single firehose column (#25641)
0139b1c8e Update uri to version 0.12.2 (CVE fix) (#25657)
f8bd58112 Remove unused routes (#25578)
683ba5ecb Fix rails `rewhere` deprecation warning in directories api controller (#25625)
\Master?/ \ますたー/
Merged mastodon/mastodon at 4fe2d7cb59f4622ff8af2f048b883f413e87c68e.