Merge branch '1716-handle-nickname-clashes' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 1 Jul 2020 13:51:23 +0000 (13:51 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 1 Jul 2020 13:51:23 +0000 (13:51 +0000)
commitfa7a0be2252fc52202cf84b6549e2ff2e731c4ff
treeeb0d51b366c2785e89bd2ae016fda2c7bd45c478
parentd889c9ca709a085031ab2b7ebfe4755c7471991d
parentfedfe8f7d6f78d77e9cbaf70fa8a9e8df38463f7
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