Conflicts: - `app/validators/poll_options_validator.rb`: Upstream split `PollValidator` in two, and glitch-soc had local changes to make the options configurable. Refactored as upstream did, keeping glitch-soc's configurable limits. |
||
|---|---|---|
| .. | ||
| filter_serializer.rb | ||
| instance_serializer.rb | ||
| notification_policy_serializer.rb | ||