Merge branch 'develop' into issue/1383

2020-01-28 20:34:13 +03:00 · 2020-01-28 20:34:13 +03:00 · 21a2a05407
commit 21a2a05407
parent bfc70fdf29 e8f22451da
44 changed files with 4004 additions and 266 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -411,14 +411,6 @@ config :pleroma, Pleroma.Web.Metadata,
  ],
  unfurl_nsfw: false

-config :pleroma, :suggestions,
-  enabled: false,
-  third_party_engine:
-    "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}",
-  timeout: 300_000,
-  limit: 40,
-  web: "https://vinayaka.distsn.org"
-
 config :pleroma, :http_security,
  enabled: true,
  sts: false,