Conflicts: - `app/helpers/application_helper.rb`: Conflict because of our different theming systems. Updated accordingly, along with `app/helpers/theme_helper.rb` and `app/helpers/theme_helper_spec.rb`.
Setting.authorized_fetch
render_symbol
inline_svg_tag
InstanceVariables
media/
settings/featured_tags/index
link_to_older
link_to_newer