diff options
| author | lain <lain@soykaf.club> | 2020-09-18 12:25:10 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-18 12:25:10 +0000 |
| commit | 7e02f4ed3b9601c1590e77a1aa8e56bc7edf6d18 (patch) | |
| tree | c5d3666775ffb9ffeac1b3285bb0122374806c0b /config | |
| parent | 875b6654ec3f4cd0dd965bd3d2bdc1f67bb9c07a (diff) | |
| parent | 226fa3e486e3ea9f82e8d3a7025244fdf11d14db (diff) | |
| download | pleroma-7e02f4ed3b9601c1590e77a1aa8e56bc7edf6d18.tar.gz | |
Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
Closes #2118
See merge request pleroma/pleroma!3008
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 104013b41..147f09722 100644 --- a/config/config.exs +++ b/config/config.exs @@ -799,6 +799,8 @@ config :tzdata, :http_client, Pleroma.HTTP.Tzdata config :ex_aws, http_client: Pleroma.HTTP.ExAws +config :web_push_encryption, http_client: Pleroma.HTTP + config :pleroma, :instances_favicons, enabled: false config :floki, :html_parser, Floki.HTMLParser.FastHtml |