diff options
| author | lain <lain@soykaf.club> | 2020-01-28 17:52:42 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-28 17:52:42 +0100 |
| commit | cedee2793d96b0384a3041ea0a6cd1f2b1c3dd1e (patch) | |
| tree | dfc1a2b2bb27d845bbde24b023287122f5d39ed7 /config/config.exs | |
| parent | ae78059ff433739b83aaa3ccff9245ace153146d (diff) | |
| parent | e8f22451da18aeba9bcf9f9f6acf93690ccb3cba (diff) | |
| download | pleroma-cedee2793d96b0384a3041ea0a6cd1f2b1c3dd1e.tar.gz pleroma-cedee2793d96b0384a3041ea0a6cd1f2b1c3dd1e.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
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, |