Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change.
class_names
Setting.authorized_fetch
image_pack_tag
InstanceVariables
media/
settings/featured_tags/index
link_to_older
link_to_newer