Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some preferences to a new category, while glitch-soc had an extra preference there. Moved the extra preference like upstream did to the new category.
BrowserDetection
cache_collection
EmailHelper
normalizes
CustomFilterCache
DatabaseViewRecord.refresh
by_domain_length
DomainNormalizable
Rails/WhereRange
ActiveModel::Attributes
FollowLimitable
InetContainer
containing
contained
with_lock
with_redis_lock
StatusTrend
PreviewCardTrend
locales
RankedTrend
attribute
rate_limit
delete_matched
OpenSSL::SSL::SSLError
reviewed
unreviewed
Reviewable