Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some preferences to a new category, while glitch-soc had an extra preference there. Moved the extra preference like upstream did to the new category.
LOCAL_DOMAIN
tootctl admin create
AccountStatusesFilter
AnnualReport.prepare
rubocop-rspec
DeliveryFailureTracker
DomainResource
Style/GuardClause
Webfinger