Files
mastodon/app/lib
Claire 93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.
2025-06-24 22:43:43 +02:00
..
2025-05-23 06:43:02 +00:00
2024-10-31 15:12:08 +00:00
2023-06-06 10:42:47 +02:00
2024-11-22 14:43:16 +00:00
2020-10-12 16:33:49 +02:00