projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 468cc97 771c1ad)
Merge branch 'fix/follow-and-blocks-import' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 22 Apr 2020 15:46:04 +0000 (15:46 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 22 Apr 2020 15:46:04 +0000 (15:46 +0000)
Fix follower/blocks import when nicknames starts with @

Closes #1698

See merge request pleroma/pleroma!2416

1  2 
test/user_test.exs patch | diff1 | diff2 | blob | history

diff --cc test/user_test.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git