diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-08-10 11:32:24 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-08-10 11:32:24 -0500 |
| commit | 024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4 (patch) | |
| tree | d862c79e2296286af0b41d0a884796680627f298 /config | |
| parent | e08ea01d09c67a93801aa05d33bad0eb24dfca8b (diff) | |
| parent | 93fbf399543fead24f8066d0cba33a0a51b89dd3 (diff) | |
| download | pleroma-024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4.tar.gz pleroma-024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4.zip | |
Merge branch 'develop' into fix/activity-expirations-again
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 100dbca15..eb85a6ed4 100644 --- a/config/config.exs +++ b/config/config.exs @@ -743,6 +743,8 @@ config :ex_aws, http_client: Pleroma.HTTP.ExAws config :pleroma, :instances_favicons, enabled: false +config :floki, :html_parser, Floki.HTMLParser.FastHtml + config :pleroma, Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthenticator # Import environment specific config. This must remain at the bottom |