mastodon/app/serializers
David Yip 7600067a30
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
    	db/schema.rb
2018-05-04 14:16:30 -05:00
..
activitypub Store URIs of follows, follow requests and blocks for ActivityPub (#7160) 2018-05-04 21:14:34 +02:00
rest Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
rss
web Fix WebPush (regression from #4524) (#4778) 2017-09-02 16:50:42 +02:00
initial_state_serializer.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb