Conflicts: - `app/views/layouts/application.html.haml`: Upstream changed how theming works, and in particular changed the set of HTML attributes. Adapted upstream's change.
pluck
DomainAllow.allowed_domains
x.mastodon
media#player
config_for
LOCAL_DOMAIN
http_message_signatures