Conflicts: - `app/helpers/theme_helper.rb`: Conflict caused by our different theme systems. Ported upstream's changes. - `app/models/account.rb`: Upstream basically made a change we already made. Moved constant declaration to match upstream.
well_known/webfinger
before_all
requests/cache_spec
RSpec/ExampleLength
remote_interaction_helper