Files
mastodon/app
Claire 8d717ab161 Merge commit '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream
Conflicts:
- `spec/controllers/application_controller_spec.rb`:
  Upstream moved specs that were textually-adjacent to glitch-soc ones.
  Kept the glitch-soc ones.
2026-03-09 18:14:15 +01:00
..
2026-03-02 18:59:32 +01:00