Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.
Setting.authorized_fetch
image_pack_tag
InstanceVariables
media/
settings/featured_tags/index
link_to_older
link_to_newer