Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream added a `features` attribute where glitch-soc had extra ones. Added `features` like upstream did.
BrowserDetection
cache_collection
CustomFilterCache
DatabaseViewRecord.refresh
by_domain_length
DomainNormalizable
Rails/WhereRange
ActiveModel::Attributes
FollowLimitable
InetContainer
containing
contained
with_lock
with_redis_lock
StatusTrend
PreviewCardTrend
locales
RankedTrend
delete_matched
OpenSSL::SSL::SSLError
reviewed
unreviewed
Reviewable