diff options
| author | lain <lain@soykaf.club> | 2020-08-07 20:59:44 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-07 20:59:44 +0000 |
| commit | 47698fc322da58894dd41c1bfd5ca0376200dc5e (patch) | |
| tree | 0ad164ee09bba1a82560d192d71d14033f70b195 /config | |
| parent | 39ca4a23c6c4a6cac9b277b8473ab9040a250e68 (diff) | |
| parent | 54e2af829377b3f21823548e5612bbbb41550432 (diff) | |
| download | pleroma-47698fc322da58894dd41c1bfd5ca0376200dc5e.tar.gz pleroma-47698fc322da58894dd41c1bfd5ca0376200dc5e.zip | |
Merge branch 'fix/ldap-auth-issues' into 'develop'
Fix LDAP auth issues
Closes #1646
See merge request pleroma/pleroma!2852
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 393f74372..100dbca15 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 :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" |