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.
Form::Import
AccountMigration
AccountStatusCleanupPolicy
Announcement
Appeal
BulkImport
DomainAllow
Follow
IpBlock
LoginActivity
BrowserDetection
PreviewCard
StatusTrend
PreviewCardTrend
locales
RankedTrend
AccountWarning
Report#history
SoftwareUpdateCheckService
StatusPin
Tombstone
WebauthnCredential