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.
Tombstone
LoginActivity
BrowserDetection
ActivityPub::DeliveryWorker
require_relative
likes
shares