Merge branch 'media-preview-proxy-nostream' into 'develop'
authorfeld <feld@feld.me>
Fri, 18 Sep 2020 18:38:20 +0000 (18:38 +0000)
committerfeld <feld@feld.me>
Fri, 18 Sep 2020 18:38:20 +0000 (18:38 +0000)
commit6c052bd5b6cc29d321b500654bd6b098d0e6c56a
tree9357c0e0f653f8e35d63e32eb0faf090e600a816
parent91ddd47e513c5fc343ffa9bea069801b0142a115
parenta42880040574701000470fc1c2dbd6f7242c1a06
Merge branch 'media-preview-proxy-nostream' into 'develop'

Media preview proxy

See merge request pleroma/pleroma!3001
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md
mix.lock