Claire 59e02a628d Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/backup_service.rb`:
  Upstream refactored activity serialization while glitch-soc passed an extra argument.
  Followed upstream's refactor, keeping our extra argument.

2026-02-05 12:43:12 +01:00

..

fasp

Update to linzer 0.7 (#34765)

2025-05-23 06:43:02 +00:00

v1

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

2026-02-05 12:43:12 +01:00

v1_alpha

Federate Remove when collection is deleted (#37741)

2026-02-05 10:33:39 +00:00

v2

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

2025-08-05 15:46:33 +02:00

web

Merge commit from fork

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

base_controller.rb

Move "limited federation mode" config to x.mastodon area (#35041)

2025-06-16 06:13:03 +00:00

oembed_controller.rb

Move default embed size knowledge into OEmbedSerializer (#31990)

2024-09-20 12:39:48 +00:00