Conflicts: - `Gemfile.lock`: Conflict because we had updated the `json-ld` gem to fix a yanked dependency. Kept our version of `json-ld` while updating other dependencies.
Setting.authorized_fetch
InstanceVariables
/share
Rails.application.routes.url_helpers