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. |
||
|---|---|---|
| .. | ||
| bookmarks_spec.rb | ||
| favourites_spec.rb | ||
| pins_spec.rb | ||
| sources_spec.rb | ||