Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict because one of the removed lines was modified to accomodate for glitch-soc's slightly different build system. Removed the lines as upstream did.
<Directory>
'navigator'
Iterable.isIndexed
<HashtagHeader>
disconnectTimeline
timelineDelete
author_account
authors