projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
931c497
8d9f43e
)
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
author
kaniini
<ariadne@dereferenced.org>
Wed, 24 Jul 2019 19:29:01 +0000
(19:29 +0000)
committer
kaniini
<ariadne@dereferenced.org>
Wed, 24 Jul 2019 19:29:01 +0000
(19:29 +0000)
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
1
2
lib/pleroma/web/web_finger/web_finger.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/support/http_request_mock.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/web_finger/web_finger_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/web_finger/web_finger.ex
Simple merge
diff --cc
test/support/http_request_mock.ex
Simple merge
diff --cc
test/web/web_finger/web_finger_test.exs
Simple merge
projects / akkoma / commitdiff