mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 18:40:12 -05:00
2e786e13cb
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. |
||
---|---|---|
.. | ||
admin | ||
filters | ||
filters_controller.rb | ||
instances_controller.rb | ||
media_controller.rb | ||
search_controller.rb | ||
suggestions_controller.rb |