おしごとしよう寝 
3869e8c210 (upstream/main) Change "Sign in" to "Login" (#24942)
0eed06073f Fix videos being improperly positioned on safari (#24943)
5eeb40bdbe Add stricter ESLint rules for Typescript files (#24926)
b878e3d8df Enable ESLint react/no-deprecated (#24471)
2d5e257938 Rewrite `logo.tsx` as FC (#24909)
6f8db56a01 Disable RTK safety middlewares (#24936)
349cae0b57 Add type annotation for DisplayName component (#24752)
ab7716cff4 Rename Image component to ServerHeroImage (#24894)
ういうい
CONFLICT (content): Merge conflict in app/javascript/mastodon/reducers/index.ts
import identity_proofs from './identity_proofs';
が居るよね。
\Master?/ \ますたー/
Merged mastodon/mastodon at 3869e8c21069a9bc927e93c904e00d68b004a5be.