Claire ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.

2026-05-30 12:13:35 +02:00

..

fasp

Reject unconfirmed FASPs (#37926)

2026-02-20 14:40:31 +00:00

v1

Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream

2026-05-30 12:13:35 +02:00

v1_alpha

Move Collections API to v1 namespace (#39210)

2026-05-29 08:39:51 +00:00

v2

Merge commit '1a2038775c0a999024a615348fcba6240e27b0fa' into glitch-soc/merge-upstream

2026-05-06 21:00:32 +02:00

web

Typo fix in federation document (#37564)

2026-01-22 13:59:36 +00:00

oembed_spec.rb

Add response.content_type checks for JSON to api/v1 request specs (#31981)

2024-09-20 13:13:04 +00:00