Conflicts: - `app/helpers/settings_helper.rb`: Upstream added a new helper. Conflict caused by the fact there is a glitch-soc specific helper. Added upstream's new helper in addition to glitch-soc's.
rubocop-rails
2.33.4
2.34.2
mastodon-async-refresh
debug?
nan-TW