mastodon/app/serializers
Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
2022-05-11 09:37:48 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-03-28 16:22:28 +02:00
nodeinfo
rest Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00
web
initial_state_serializer.rb
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb