From: kaniini <nenolod@gmail.com>
Date: Wed, 9 Jan 2019 07:09:39 +0000 (+0000)
Subject: Merge branch 'hotfix/media-proxy-uri' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=5c5c8508c203886f32b150e7d8c1f7362a4fde0e;p=akkoma

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
---

5c5c8508c203886f32b150e7d8c1f7362a4fde0e