mastodon/app/serializers
Thibaut Girka 89bee860cd Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/services/post_status_service.rb
  Small conflict due to handling of instance-local toots.
  A subsequent change is required to ensure instance-local polls are not leaked
  through Update.
2019-03-11 11:23:50 +01:00
..
activitypub Support pushing and receiving updates to poll tallies (#10209) 2019-03-11 00:49:31 +01:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
rss
web
initial_state_serializer.rb
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb