diff options
| author | lain <lain@soykaf.club> | 2020-08-11 10:55:10 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-11 10:55:10 +0200 |
| commit | 677abbf0ee8d44f88e40f21526c401eb4ed8cc05 (patch) | |
| tree | 7669034cb73935b8f9fde9df419d33cd56117346 /config | |
| parent | 7e4932362b7e672b08543cfd189deb3776268fe3 (diff) | |
| parent | 024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4 (diff) | |
| download | pleroma-677abbf0ee8d44f88e40f21526c401eb4ed8cc05.tar.gz pleroma-677abbf0ee8d44f88e40f21526c401eb4ed8cc05.zip | |
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma 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 |