Conflicts: - `app/controllers/follower_accounts_controller.rb`: Upstream refactored a part of the code where glitch-soc has changed the code to potentially hide followers count. Adapt upstream's changes.
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