Conflicts: - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions.
order
Notification::Groups
BrowserDetection
cache_collection
CustomFilterCache
by_domain_length
DomainNormalizable
Rails/WhereRange
InetContainer
containing
contained
devise-two-factor
with_lock
with_redis_lock
StatusTrend
PreviewCardTrend
locales
RankedTrend
delete_matched
OpenSSL::SSL::SSLError
reviewed
unreviewed
Reviewable