Conflicts: - `tsconfig.json`: glitch-soc had extra paths under `app/javascript/flavours`, but upstream added `app/javascript` as a whole, so updated to upstream's.
BrowserDetection
cache_collection
CustomFilterCache
by_domain_length
DomainNormalizable
Rails/WhereRange
InetContainer
containing
contained
StatusTrend
PreviewCardTrend
locales
RankedTrend
delete_matched
OpenSSL::SSL::SSLError
reviewed
unreviewed
Reviewable