よっこらし 
3afd59df0 (upstream/main) Fix tootctl email_domain_blocks add (#17842)
f29458da1 Fix streaming server sometimes silently dropping subscriptions (#17841)
7eb2e791e Bump @babel/core from 7.17.7 to 7.17.8 (#17836)
47ada1b6d Bump @babel/runtime from 7.17.7 to 7.17.8 (#17835)
a651a9678 Bump rubocop-rails from 2.14.0 to 2.14.2 (#17833)
584d8b977 Format JSON and YAML using Prettier (#17823)
cf5435bb2 Fix being unable to search by domain (#17832)
$ git merge --no-edit master
Auto-merging streaming/index.js
Auto-merging app.json
CONFLICT (content): Merge conflict in app.json
Auto-merging Gemfile.lock
Automatic merge failed; fix conflicts and then commit the result.
どっこらし
どしてapp.json…
そしてストリーミング切れちゃうのなおったのかしら!!