Skip to content
Snippets Groups Projects
Commit fa7a0be2 authored by rinpatch's avatar rinpatch
Browse files

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
parents d889c9ca fedfe8f7
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment