projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c433ed9
a8aa917
)
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
author
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Fri, 10 Apr 2020 04:31:13 +0000
(
04:31
+0000)
committer
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Fri, 10 Apr 2020 04:31:13 +0000
(
04:31
+0000)
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
1
2
lib/pleroma/web/activity_pub/transmogrifier.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/activity_pub_controller_test.exs
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/activity_pub_controller_test.exs
Simple merge
diff --cc
test/web/activity_pub/transmogrifier_test.exs
Simple merge
projects / akkoma / commitdiff