mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-08 16:02:14 -05:00
Conflicts: - `app/validators/status_pin_validator.rb`: Upstream refactored that file, while glitch-soc had configurable limits for pinned statuses. Updated the code with upstream's refactor, while keeping glitch-soc's configurability.