Merge branch '1937-renaming' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 13 Jul 2020 12:06:43 +0000 (12:06 +0000)
committerHaelwenn <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