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

# Conflicts:
#   config/config.exs

diff --cc config/config.exs
index 78f3232e689209d9aac55e293a03ede003e5f684,100dbca15a37b81b7e20a54818897f96d9c2f5df..eb85a6ed41e5dbcd64a5584270c38c5e289dc904
--- 1/config/config.exs
--- 2/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"