diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 21:11:13 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 21:11:13 +0300 |
commit | ba5e8a644463a19b863e862def80adb6a5a1060b (patch) | |
tree | b00fdfbfe13979454dcad185e8c0c7de237d8a0f /config/config.exs | |
parent | e442ea5722404ca551135b6f4767c016952bbda3 (diff) | |
parent | f1d5c0f07963c23d264311985c21837b9b03fd5a (diff) | |
download | pleroma-ba5e8a644463a19b863e862def80adb6a5a1060b.tar.gz pleroma-ba5e8a644463a19b863e862def80adb6a5a1060b.zip |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'config/config.exs')
-rw-r--r-- | config/config.exs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/config/config.exs b/config/config.exs index 2c154eb45..f4e307e18 100644 --- a/config/config.exs +++ b/config/config.exs @@ -425,14 +425,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, |