Conflicts: - `tsconfig.json`: glitch-soc had extra paths under `app/javascript/flavours`, but upstream added `app/javascript` as a whole, so updated to upstream's.
SKIP_POST_DEPLOYMENT_MIGRATIONS
config_for
x.mastodon
Style/FormatStringToken
ENV.fetch
rails
OAuth
rack
/health
Style/PreferredHashMethods