Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 17 Sep 2020 19:22:59 +0000 (22:22 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 17 Sep 2020 19:22:59 +0000 (22:22 +0300)
commita42880040574701000470fc1c2dbd6f7242c1a06
tree666d244b9bf4f38b4421deea8d3b8bbb10ec179e
parentd9fb5bc08ad67b55d0cd25c1a0d7d3a740758427
parent7bf269fe836ded974d2187c6b36eba4ab185ff25
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream

# Conflicts:
# CHANGELOG.md
CHANGELOG.md
lib/pleroma/web/router.ex
test/web/mastodon_api/views/account_view_test.exs