お仕事すゆよ 
3ca348fa1 (upstream/main) Bump i18n-tasks from 1.0.9 to 1.0.10 (#18370)
593637145 Bump babel-jest from 28.0.3 to 28.1.0 (#18374)
19216f93b Bump jest-environment-jsdom from 28.0.2 to 28.1.0 (#18379)
e7d0bf731 Bump capybara from 3.36.0 to 3.37.1 (#18376)
d3c18058d Bump react-select from 5.3.1 to 5.3.2 (#18382)
b4d373a3d Add `limited` attribute to accounts in REST API and a warning in web UI (#18344)
898fe2fa8 Fix typo in source `setted`->`set` (#18385)
662ed53c1 Fix block/mute lists showing a follow button when unblocking a user (#18364)
f714e24ff Fix redis configuration not being changed by mastodon:setup (#18383)
app/javascript/mastodon/features/account/components/header.js
<<<<<<< HEAD
const { account, intl, domain, identity_proofs } = this.props;
=======
const { account, hidden, intl, domain } = this.props;
>>>>>>> master
あうあう
コンフリクトを解消してるあいだにマージ増えてるのまじ
95555f15b (upstream/main) Bump jest from 28.0.3 to 28.1.0 (#18377)
68260c025 Bump sidekiq-unique-jobs from 7.1.21 to 7.1.22 (#18375)
a2ef5e321 Bump array-includes from 3.1.4 to 3.1.5 (#18381)