Skip to content
Snippets Groups Projects
Commit 5c5c8508 authored by kaniini's avatar kaniini
Browse files

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
parents 3aee8bb6 567651fb
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment