mastodon/app/serializers
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	db/schema.rb
2018-04-14 09:12:50 -05:00
..
activitypub
rest Merge remote-tracking branch 'origin/master' into gs-master 2018-04-14 09:12:50 -05:00
web
initial_state_serializer.rb
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb