Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused.
RSpec/SpecFilePathFormat
Style/RedundantReturn
Rails/RedundantActiveRecordAllMethod
EmojiFormatter#count_tag_nesting
inLanguage
/deck
account_id
max_id
min_id
StatusCacheHydrator