Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. - `app/lib/account_statuses_filter.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes.		2024-05-01 19:30:41 +02:00
..
activitypub	…
node_info	…
rest	Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream	2024-05-01 19:30:41 +02:00
web	…
initial_state_serializer.rb	Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream	2024-04-06 21:01:40 +02:00
manifest_serializer.rb	Use a helper to avoid using `media/` asset prefixes (#28756)	2024-01-17 12:19:51 +00:00
oembed_serializer.rb	…
webfinger_serializer.rb	…