Claire 1fdb48c668 Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Updated upstream changes.

2025-12-15 20:22:20 +01:00

..

fasp

Update to linzer 0.7 (#34765)

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

v1

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

2025-12-15 20:22:20 +01:00

v1_alpha

Add simple API to remove item from collection (#37225)

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