mastodon/app/serializers
Thibaut Girka abcba5c198 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-07 12:28:59 +01:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
nodeinfo
rest Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
rss
web
initial_state_serializer.rb
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb