projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6b9a683
1197ec1
)
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Thu, 24 May 2018 19:52:24 +0000
(19:52 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Thu, 24 May 2018 19:52:24 +0000
(19:52 +0000)
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
1
2
lib/pleroma/web/activity_pub/transmogrifier.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/utils.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/twitter_api/twitter_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/utils.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc
test/web/twitter_api/twitter_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff