よっこいし 
6463415e06 (upstream/main) Update `rubocop-rspec` to version 3.6.0 (#34497)
22ec828951 Change `DEFAULT_LOCALE` to not override unauthenticated users' browser language (#34535)
13b13c8726 Reduce path size for oEmbed and logo (#34538)
5679bb5394 fix(deps): update dependency pg to v8.15.5 (#34531)
1fc66c1970 New Crowdin Translations (automated) (#34534)
57a6c5f4e9 chore(deps): update dependency connection_pool to v2.5.2 (#34530)
65c67fb827 fix(deps): update dependency pg-connection-string to v2.8.5 (#34532)
Auto-merging app/javascript/images/logo-symbol-icon.svg
CONFLICT (content): Merge conflict in app/javascript/images/logo-symbol-icon.svg
あー
って元のファイルかあ。checkout --oursで。
\Master?/ \ますたー/
Merged mastodon/mastodon at 6463415e06d4d617e011adf7e184276f0007137a.