David Yip 087c79669a 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	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +02:00
web	Fix WebPush (regression from #4524) (#4778)	2017-09-02 16:50:42 +02:00
initial_state_serializer.rb	retrieve custom emoji list via API instead of before page load (#7047)	2018-04-04 22:25:34 +02:00
manifest_serializer.rb	implement web share target (#6278)	2018-01-17 17:08:10 +01:00
oembed_serializer.rb	Clean up and improve generated OpenGraph tags (#4901)	2017-09-12 05:39:38 +02:00
webfinger_serializer.rb	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00