projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a511d2f e1370ba)
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 5 Jun 2019 15:52:40 +0000 (15:52 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 5 Jun 2019 15:52:40 +0000 (15:52 +0000)
Bugfix/377 stuck follow request

Closes #377

See merge request pleroma/pleroma!1250

1  2 
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history
test/user_test.exs patch | diff1 | diff2 | blob | history

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