mastodon/app/serializers
Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
2020-06-30 23:00:20 +02:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
nodeinfo
rest Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
rss
web
initial_state_serializer.rb
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb