どばー 
Update `zeitwerk` to version 2.7.1 (#32723)
Update `rails-i18n` to version 7.0.10 (#32719)
Drop support for ruby 3.1 (#32363)
Add model spec for `Tombstone` (#32697)
Migrate from the deprecated `azure-storage-blob` to `azure-blob` (#32080)
Update dependency node to v22 (#32689)
Update dependency core-js to v3.39.0 (#32707)
Update dependency selenium-webdriver to v4.26.0 (#32698)
Update dependency strong_migrations to v2.0.2 (#32705)
New Crowdin Translations (automated) (#32708)
Fix IDs not being serialized as strings in annual reports API (#32710)
Fix 'unknown' media attachment rendering in detailed view (#32713)
Add userinfo oauth endpoint (#32548)
New Crowdin Translations (automated) (#32695)
Update workbox monorepo to v7.3.0 (#32691)
Update dependency libvips to v8.16.0 (#32679)
Fix preview cards with long titles erroneously causing layout changes (#32678)
$ git merge --no-edit master
Auto-merging Gemfile
CONFLICT (content): Merge conflict in Gemfile
Auto-merging Gemfile.lock
:
Gemfileだけコンフリクトするの珍しいなw
なるほどですね
source 'https://rubygems.org'
<<<<<<< HEAD
ruby file: '.ruby-version'
=======
ruby '>= 3.2.0'
>>>>>>> master
\Master?/ \ますたー/
Merged mastodon/mastodon at b06fd54c305915527e3a6edc575dc23b623143ef.