Claire 2f491f0d48 Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6 ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version.
   Did it as well.

2026-06-23 18:01:59 +02:00

..

fasp

Reject unconfirmed FASPs (#37926)

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

v1

Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6

2026-06-23 18:01:59 +02:00

v1_alpha

Move Collections API to v1 namespace (#39210)

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

v2

Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream

2026-06-09 21:30:54 +02:00

web

Merge commit from fork

2026-01-20 15:10:38 +01:00

base_controller.rb

Add Deprecation headers to collections alpha API (#39349)

2026-06-09 15:40:01 +00:00

oembed_controller.rb

…