Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 19 Jul 2020 17:05:37 +0000 (20:05 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 19 Jul 2020 17:05:37 +0000 (20:05 +0300)
commitbdf57b8ef438f32999ef917777b13161320644a8
treeb72dc8ce2621eeb25e14504d6ce73c6657fac571
parent9faa63203717e71d666afb6755ff0b781b491823
parentf0d13fc3f7d0e9b58cfe1cd8918072d45d656a31
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy

# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
.gitlab-ci.yml
config/config.exs
lib/pleroma/reverse_proxy/reverse_proxy.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/media_proxy/media_proxy.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock
test/web/media_proxy/media_proxy_test.exs