Conflicts: - `app/services/backup_service.rb`: Upstream refactored activity serialization while glitch-soc passed an extra argument. Followed upstream's refactor, keeping our extra argument.
mail
Remove
DateOfBirthValidator
COVERAGE
PollExpirationValidator
likes
shares