diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-13 12:06:43 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-13 12:06:43 +0000 |
commit | f918b6f86ddf8e101a9ce22a46694788eb48b5c7 (patch) | |
tree | 94e0062e8f408e7e876a23912dc5dbcf2d616158 /rel | |
parent | 11dd29ef3f9bb5b0b3109eb572c3d5ae2c830ea3 (diff) | |
parent | 93e494ec212b5bb6aae31a3b43304ed230d095e2 (diff) | |
download | pleroma-f918b6f86ddf8e101a9ce22a46694788eb48b5c7.tar.gz |
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
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions