Skip to content
Snippets Groups Projects
Commit f918b6f8 authored by Haelwenn's avatar Haelwenn
Browse files

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
parents 11dd29ef 93e494ec
No related branches found
No related tags found
No related merge requests 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