Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream

# Conflicts: # CHANGELOG.md
2020-09-17 22:22:59 +03:00 · 2020-09-17 22:22:59 +03:00 · a428800405
commit a428800405
parent d9fb5bc08a 7bf269fe83
32 changed files with 632 additions and 89 deletions
--- a/test/web/mastodon_api/views/account_view_test.exs
+++ b/test/web/mastodon_api/views/account_view_test.exs
@ -69,7 +69,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
        sensitive: false,
        pleroma: %{
          actor_type: "Person",
-          discoverable: false
+          discoverable: true
        },
        fields: []
      },
@ -167,7 +167,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
        sensitive: false,
        pleroma: %{
          actor_type: "Service",
-          discoverable: false
+          discoverable: true
        },
        fields: []
      },