Conflicts: - `app/lib/content_security_policy.rb`: Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to glitch-soc's `EXTRA_DATA_HOST`. Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.
admin/settings/branding
disputes/strikes
filters/statuses
oauth/tokens#revoke
settings/deletes
statuses#activity
render_template
body_as_json
response.parsed_body
expect
intents
statuses