Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 7 Aug 2020 06:38:05 +0000 (09:38 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 7 Aug 2020 06:38:05 +0000 (09:38 +0300)
commit1298a2ea2c63f14cc080eb549377c6a1274b1628
treefe50b19542682173af1314766571731f69e904f5
parentb8021016ebef23903c59e5140d4efb456a84a347
parentb9ebb55d2aabdf4c99b05efab9d4ad31b25f888d
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy

# Conflicts:
# mix.lock
config/config.exs
lib/pleroma/reverse_proxy/reverse_proxy.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock