Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream added a `features` attribute where glitch-soc had extra ones. Added `features` like upstream did.
LOCAL_DOMAIN
prune
AccountStatusesFilter
AnnualReport.prepare
rubocop-rspec
DomainResource
PlainTextFormatter