From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Mon, 13 Jul 2020 12:06:43 +0000 (+0000)
Subject: Merge branch '1937-renaming' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f918b6f86ddf8e101a9ce22a46694788eb48b5c7;p=akkoma

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
---

f918b6f86ddf8e101a9ce22a46694788eb48b5c7