Conflicts: - `app/helpers/theme_helper.rb`: Upstream added a helper to insert javascript tags, close to where we had modified code. Ported upstream's change.
x.mastodon
filter_keywords
icon
Lint/NonLocalExitFromIterator
IpBlock.severity...
config_for