たいへんよくねてました 
ec19d0a14b (upstream/main) Change mute, block and domain block confirmations in web UI (#29576)
be7a68b095 Change Explore icon to compass in advanced interface (#29610)
4f4132f1a1 Add diagnostic message for failure during CLI search deploy (#29462)
c76ae7a5c0 Convert `packs/public.jsx` to Typescript (#29501)
407287573c Add domain information to profiles in web UI (#29602)
52200b6bbf Update dependency sass to v1.72.0 (#29586)
f445d33fd6 Fix haml-lint `LineLength` cops in app/views/admin (#28680)
7720c684c5 Move common module inclusion in sub classes to `ActivityPub::BaseController` (#29560)
2e91a9bd34 Add `include_pagination_headers` matcher to check `Link` header in api specs (#29596)
6865fda593 New Crowdin Translations (automated) (#29603)
e75b55a6d7 Extract target account on list method in bulk import row service spec (#29601)
838b0bdf2d Remove unused `Account::Interactions#endorsed?` method (#29463)
d39d625561 Use inclusive range in `ActivityTracker#get` (#29413)
(続く)
df6086d402 Extract file size sql calc from media storage cli (#29577)
6c3e718b86 Remove setting of `sensitive` value (default false, not null) in Status model (#29589)
974c7672e5 Extract shared behavior methods in oauth feature spec (#28360)
14aa7f1e15 Use `Account.activitypub` generated scope (#28157)
049d9171eb Use `with_options` for shared option in `accounts#show` routing block (#28914)
30483d618f Fix back button appearing in column header unexpectedly in web UI (#29551)
95a5713ff7 Fix accounts not getting imported into redux store for some filtered notification types (#29588)
0bc17a3d48 Use enum-generated `public_visibility` scope on Status (#28156)
19cbadfbd6 Use enum-generated scope for `IpBlock` in CLI (#28144)
681a89f684 Readability clean up in `ImportVacuum` spec (#28955)
79e7590578 Clean up `activitypub` module route scope near instance actor (#29579)
65e8349980 Clean up `activitypub` module route scope near collections/boxes (#29580)
(まだ続く)
18ffd4d925 Add module `instances` route scope in api routes (#29581)
01ecc80118 Add module `accounts` route scope in api routes (#29582)
4991198b70 Change design of metadata underneath posts in web UI (#29585)
f9100743ec Add `Api::ErrorHandling` concern for api/base controller (#29574)
1e1d97a787 Fix wrong background color on search results in web UI (#29584)
5aea35de13 New Crowdin Translations (automated) (#29587)
42875fee52 Add coverage for bad args/options in `CLI::Domains#purge` (#29578)
3156d04ec1 Use sender's `username` to column title in notification request if it's `display_name` is not set (#29575)
へいへーい
CONFLICT (content): Merge conflict in app/javascript/mastodon/features/account/components/header.jsx
Keybaseの分ね
d702a03a0c (upstream/main, upstream/gh-readonly-queue/main/pr-29614-ec19d0a14bd8f5e76293ca52cf67972e01c2135f) Add “Learn more” on block modal to inform of federation caveats (#29614)
あ。ふえた。
\Master?/ \ますたー/
Merged mastodon/mastodon at d702a03a0c35fc631a0fa456532946e6751cbbfd.
@zundan ダジャレを検出しました（検出ワード: CONFLICT）