David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream		2017-09-09 14:28:08 -05:00
..
activitypub	Minor ActivityPub JSON fixes (#4214)	2017-07-16 10:28:55 +02:00
account_relationships_presenter.rb	Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)	2017-09-05 17:48:13 +02:00
initial_state_presenter.rb	Add protocol handler. Handle follow intents (#4511)	2017-08-14 04:53:31 +02:00
instance_presenter.rb	Merge branch 'origin/master' into sync/upstream	2017-09-09 14:27:47 -05:00
status_relationships_presenter.rb	Pinned statuses (#4675)	2017-08-25 01:41:18 +02:00