Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 2 Jul 2020 13:36:54 +0000 (16:36 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 2 Jul 2020 13:36:54 +0000 (16:36 +0300)
commit61180ab6f4b85ab78de2eaf1bc1b974c9e7908af
tree0970691b2060e06b6feaf4e645021298a7efda0d
parent0e23138b50f1fdd9ea78df31eec1b3caac905e2c
parent4c044f62258b33a95b8281e1eb42a5e0ce47d42d
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy

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