From: lain <lain@soykaf.club>
Date: Sun, 9 Aug 2020 10:53:58 +0000 (+0000)
Subject: Merge branch 'develop' into 'feat/floki-fast-html-2'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d0fc48ea67d90bf01bd546088b114362592d5eb0;p=akkoma

Merge branch 'develop' into 'feat/floki-fast-html-2'

# Conflicts:
#   config/config.exs
---

d0fc48ea67d90bf01bd546088b114362592d5eb0
diff --cc config/config.exs
index 78f3232e6,100dbca15..eb85a6ed4
--- a/config/config.exs
+++ b/config/config.exs
@@@ -737,8 -743,8 +743,10 @@@ config :ex_aws, http_client: Pleroma.HT
  
  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
  # of this file so it overrides the configuration defined above.
  import_config "#{Mix.env()}.exs"