projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d889c9c fedfe8f)
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)
ActivityPub: Handle clashing nicknames for the same ap id

Closes #1716

See merge request pleroma/pleroma!2712


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git