projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
11dd29e
93e494e
)
Merge branch '1937-renaming' into 'develop'
author
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Mon, 13 Jul 2020 12:06:43 +0000
(12:06 +0000)
committer
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Mon, 13 Jul 2020 12:06:43 +0000
(12:06 +0000)
ActivityPub: Don't rename a clashing nickname with the same ap id.
Closes #1937
See merge request pleroma/pleroma!2748
1
2
test/web/activity_pub/activity_pub_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
test/web/activity_pub/activity_pub_test.exs
Simple merge