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)
commitf918b6f86ddf8e101a9ce22a46694788eb48b5c7
tree94e0062e8f408e7e876a23912dc5dbcf2d616158
parent11dd29ef3f9bb5b0b3109eb572c3d5ae2c830ea3
parent93e494ec212b5bb6aae31a3b43304ed230d095e2
Merge branch '1937-renaming' into 'develop'

ActivityPub: Don't rename a clashing nickname with the same ap id.

Closes #1937

See merge request pleroma/pleroma!2748
test/web/activity_pub/activity_pub_test.exs