Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 11 Sep 2020 14:19:58 +0000 (17:19 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 11 Sep 2020 14:19:58 +0000 (17:19 +0300)
commit0bda85857e8f320ee7b91d8203fd621e1e2d5180
treec77346be760cff6c3f50eceee778ef43a4bd252a
parent4d18a50f3c4b6654339a6a8df71160e23b45cac0
parent9fb88c814ddadd9138ef29550a856938491a1ca4
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy

# Conflicts:
# lib/pleroma/instances/instance.ex
config/config.exs
config/description.exs
lib/pleroma/instances/instance.ex
lib/pleroma/web/mastodon_api/views/status_view.ex