projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3aee8bb 567651f)
Merge branch 'hotfix/media-proxy-uri' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 9 Jan 2019 07:09:39 +0000 (07:09 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 9 Jan 2019 07:09:39 +0000 (07:09 +0000)
user: fix local vs remote determination in remote_or_auth_active?/1

See merge request pleroma/pleroma!640

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