mastodon/app/serializers
Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.
2019-08-30 13:38:41 +02:00
..
activitypub
…
rest
…
rss
…
web
…
initial_state_serializer.rb
…
manifest_serializer.rb
…
oembed_serializer.rb
…
webfinger_serializer.rb
…