二度寝してる間に 
Fix crash when SSO_ACCOUNT_SETTINGS is not defined (#24628)
Update `attr_encrypted` & `devise-two-factor` gems (#24626)
Gem version bumps (#24131)
Add feature test for OAuth access grant (#24624)
Fix cutting off first letter of hashtag links sometimes in web UI (#24623)
Enable formatjs/prefer-pound-in-plural (#24622)
Add lines to threads in web UI (#24549)
Bump @typescript-eslint/eslint-plugin to 5.59.0 (#24573)
Bump @typescript-eslint/parser to 5.59.0 (#24568)
Update Contributor Covenant to 2.1 (#23980)
Remove `tai` locale (#23880)
Update Stylelint disable settings and ignores (#23776)
(続く)
Add eslint-plugin-formatjs (#23976)
Remove empty Kushubian (csb) local files (#24151)
Remove instance variables from helper usage (#24203)
Change styling of the recommended accounts to allow bio to be more visible (#24480)
Use CSS to trim long card descriptions (#24265)
Autofix Rubocop Style/NumericLiterals (#24468)
Fix crash in `tootctl accounts create --reattach --force` (#24557)
Fix caching logic with regards to Accept-Language, Cookie, and Signature (#24604)
Fix AccountsStatusesCleanupScheduler not spreading deletes across accounts correctly (#24607)
Add new onboarding flow to web UI (#24619)
New Crowdin updates (#24517)
ｷｪｪ
$ git merge --no-edit master
Auto-merging Gemfile
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Auto-merging app/javascript/mastodon/features/compose/components/compose_form.jsx
CONFLICT (content): Merge conflict in app/javascript/mastodon/features/compose/components/compose_form.jsx
Automatic merge failed; fix conflicts and then commit the result.
\Master?/ \ますたー/
Merged mastodon/mastodon at e9a79d46cd2d287b2c984d308ac7a6989efe3d53.