projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a2aa309
b1d4b2b
)
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
author
rinpatch
<rin@patch.cx>
Fri, 19 Mar 2021 08:36:26 +0000
(08:36 +0000)
committer
rinpatch
<rin@patch.cx>
Fri, 19 Mar 2021 08:36:26 +0000
(08:36 +0000)
Add support for actor icon being a list (Bridgy)
See merge request pleroma/pleroma!3372
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/pleroma/web/activity_pub/activity_pub_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
test/pleroma/web/activity_pub/activity_pub_test.exs
Simple merge
projects / akkoma / commitdiff