mastodon/app/serializers
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
..
activitypub
nodeinfo
rest Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
web
initial_state_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb