Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Wed, 24 Jul 2019 19:29:01 +0000 (19:29 +0000)
committerkaniini <ariadne@dereferenced.org>
Wed, 24 Jul 2019 19:29:01 +0000 (19:29 +0000)
commit19835be0677a9fa941b831ebf576c8cea9df080a
tree246ec82d9a004b8b81edfa4867f32ca12e982ccb
parent931c4974ee4a5e5e806433ce7b367928e4210e0c
parent8d9f43e1d1a55f445e4e6e4659b9493cd35d99d9
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'

Fix remote follow from /ostatus_subscribe

Closes #1103

See merge request pleroma/pleroma!1472
lib/pleroma/web/web_finger/web_finger.ex
test/support/http_request_mock.ex
test/web/web_finger/web_finger_test.exs