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)
commit5c5c8508c203886f32b150e7d8c1f7362a4fde0e
tree7853b2520be94252a722c694a1d0c5622f444493
parent3aee8bb67bd3f78ad4e638ea056bbd7b3ff4b7e7
parent567651fb3fcacbe5bb2f9c19deb9655edaaad076
Merge branch 'hotfix/media-proxy-uri' into 'develop'

user: fix local vs remote determination in remote_or_auth_active?/1

See merge request pleroma/pleroma!640
lib/pleroma/user.ex
test/user_test.exs