From: rinpatch <rinpatch@sdf.org>
Date: Wed, 1 Jul 2020 13:51:23 +0000 (+0000)
Subject: Merge branch '1716-handle-nickname-clashes' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=fa7a0be2252fc52202cf84b6549e2ff2e731c4ff;hp=fa7a0be2252fc52202cf84b6549e2ff2e731c4ff;p=akkoma

Merge branch '1716-handle-nickname-clashes' into 'develop'

ActivityPub: Handle clashing nicknames for the same ap id

Closes #1716

See merge request pleroma/pleroma!2712
---