さてさて
9e260014c7 (upstream/main) Convert `entrypoints/two_factor_authentication` to Typescript (#30105)
616e2f2666 Fix word breaking in filtered notifications badge (#30114)
88882fbbee Move Rails/HABTM cop out of todo (#30118)
1e7d5d2957 Update `devise-two-factor` to version 5.0.0 (#28325)
309f352e6a New Crowdin Translations (automated) (#30140)
2447497a4c Status length validation spec updates (#30132)
d97d31cce6 Update dependency irb to v1.13.0 (#30143)
ac1d830e6c Update dependency aws-sdk-s3 to v1.149.0 (#30136)
474e5ffaae Update dependency dotenv to v3.1.1 (#30133)
62992ba54a Update dependency sass to v1.76.0 (#30138)
a9dd68b90a Update dependency react-redux to v9.1.2 (#30146)
あい
CONFLICT (content): Merge conflict in spec/validators/status_length_validator_spec.rb
\Master?/ \ますたー/
Merged mastodon/mastodon at 9e260014c72fa83740d70d2d603e836f86e64b55.