Conflicts: - `app/helpers/theme_helper.rb`: Conflict caused by our different theme systems. Ported upstream's changes. - `app/models/account.rb`: Upstream basically made a change we already made. Moved constant declaration to match upstream.
Setting.authorized_fetch
render_symbol
inline_svg_tag
InstanceVariables
media/
settings/featured_tags/index
link_to_older
link_to_newer