Conflicts: - `.prettierignore`: Upstream added a file, glitch-soc had extra files. Took upstream's changes and moved glitch-soc's additions at the end.
LOCAL_DOMAIN
rubocop-rspec
AccountStatusesFilter
AnnualReport.prepare
DomainResource
PlainTextFormatter