Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 17 Sep 2020 14:14:20 +0000 (17:14 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 17 Sep 2020 14:14:20 +0000 (17:14 +0300)
commitd9fb5bc08ad67b55d0cd25c1a0d7d3a740758427
tree6303695147d01ab5e71e556f2b8f7725536e475f
parent7cdbd91d83c02a79c22783ca489ef82e82b31a51
parentcd93aa2aed6fda516d4fc2aabb44c5e178a6543d
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/router.ex
test/web/mastodon_api/views/account_view_test.exs