diff options
author | feld <feld@feld.me> | 2020-07-14 18:07:44 +0000 |
---|---|---|
committer | feld <feld@feld.me> | 2020-07-14 18:07:44 +0000 |
commit | 3f65f2ea79644cd8a119fc154c2792994723c7cb (patch) | |
tree | 1f82bee15cc9f338c566413881e88108c16f8ff5 /rel | |
parent | 63798e89deb2079cc0828c8722489c907c13f93c (diff) | |
parent | b3764423251c963a5ca007517189f556bfe95155 (diff) | |
download | pleroma-3f65f2ea79644cd8a119fc154c2792994723c7cb.tar.gz |
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions