ぷえ 
6e01a23e3b (upstream/main) Update dependency eslint-plugin-promise to v7 (#31120)
f045ef8e92 Update dependency eslint-plugin-jsdoc to v50 (#31330)
389549e783 Fix list creation textbox styling (#31348)
a207a1f7dc Disable stylelint rules that are conflicting with Prettier (#31339)
664bef3573 Fix styling issues with notification settings and mobile borders (#31346)
079d681ac6 Fix uninitialized grouped notifications read marker on initial load (#31347)
0e4d3c0403 New Crowdin Translations (automated) (#31337)
2edae5ea28 Convert PrivacyDropdownMenu to Typescript and generalize it to DropdownSelector component (#31338)
(続く)
a95fe931d7 Really fix duplicate border around search results (#31305)
176ba984d4 Follow up tweaking of admin UI changes part 2 (#31268)
ac9040b76b Add explainer for filtered notifications from limited accounts (#31331)
f8629367d2 Add unchangeable filtered notification setting for limited accounts (#31324)
84c3cc4e5b Replace more `font-awesome` icons in `views/admin` area (#30961)
52a626f39b Replace more `font-awesome` icons in `app/helpers` (#30962)
e4092cc73a Replace more `font-awesome` icons in `views/settings` (#30963)
abc4ed48f2 Replace more `font-awesome` icons in navigation sidebar area (#30974)
CONFLICT (content): Merge conflict in config/navigation.rb
うい。Keybase認証そろそろ止めようかな…
\Master?/ \ますたー/
Merged mastodon/mastodon at 6e01a23e3bea35f7bf90bd420f9372a6a7421fae.
@zundan ダジャレを検出しました（検出ワード: CONFLICT）