projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63798e8 b376442)
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
authorfeld <feld@feld.me>
Tue, 14 Jul 2020 18:07:44 +0000 (18:07 +0000)
committerfeld <feld@feld.me>
Tue, 14 Jul 2020 18:07:44 +0000 (18:07 +0000)
Support for hosts with scheme in MediaProxy whitelist setting

Closes #1922

See merge request pleroma/pleroma!2754

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
config/description.exs patch | diff1 | diff2 | blob | history
docs/configuration/cheatsheet.md patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
diff --cc config/description.exs
Simple merge
diff --cc docs/configuration/cheatsheet.md
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git