Conflicts: - `app/helpers/formatting_helper.rb`: Upstream added an optional keyword argument where glitch-soc already had one for content-type. Added upstream's new option while keeping glitch-soc's.
x.mastodon
image_pack_tag
obscured_counter
icon
InstanceVariables
Lint/NonLocalExitFromIterator
IpBlock.severity...
config_for