Conflicts: - `app/helpers/application_helper.rb`: Upstream reworked how CSS classes for the document's body are computed. Slight conflict due to glitch-soc's different theming system. Updated as upstream did.
Setting.authorized_fetch
image_pack_tag
icon
InstanceVariables
merge_context
media/
font-awesome
app/helpers