Claire c96eebde37 Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5 ...

Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream refactored a bit where we had an extra argument for markdown/HTML.
  Adapted upstream change.

2026-01-19 18:29:02 +01:00

..

fasp

Update to linzer 0.7 (#34765)

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

v1

Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5

2026-01-19 18:29:02 +01:00

v1_alpha

Experimental Async Refreshes API (#34918)

2025-06-12 14:54:00 +00:00

v2

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

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

web

Merge commit from fork

2025-12-08 15:44:08 +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