David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream

2017-09-09 14:28:08 -05:00

..

activitypub

…

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

…

instance_presenter.rb

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

status_relationships_presenter.rb

…