projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
17ff4b4
b1ff66d
)
Merge branch 'accept-embedded-announce-object' into 'develop'
author
kaniini
<ariadne@dereferenced.org>
Sat, 5 Oct 2019 19:28:29 +0000
(19:28 +0000)
committer
kaniini
<ariadne@dereferenced.org>
Sat, 5 Oct 2019 19:28:29 +0000
(19:28 +0000)
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
1
2
lib/pleroma/web/activity_pub/transmogrifier.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/transmogrifier_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge
diff --cc
test/web/activity_pub/transmogrifier_test.exs
Simple merge
projects / akkoma / commitdiff