さてさて 
1960aac90b (upstream/main) Fix display of failed-to-load image attachments in web UI (#34217)
a2981a0997 Convert `admin/users/two_factor_authentications` spec controller->system (#34216)
469cfc5430 Convert `admin/change_emails` spec controller->system (#34215)
0284e77e5f Convert `admin/action_logs` spec controller->system (#34214)
5eba86e2d1 New Crowdin Translations (automated) (#34231)
cf25d4fe4b chore(deps): update dependency haml_lint to v0.61.1 (#34227)
zunda @zundan@mastodon.zunda.ninja
\Master?/ \ますたー/
Merged mastodon/mastodon at 1960aac90b16fce1ec620ac990aa931efcf04700.