hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge develop into feature/770-add-emoji-tags

Browse source
This commit is contained in:
Alex S 2019-04-02 19:16:29 +07:00
commit 9e0567ec52
49 changed files with 1540 additions and 482 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -384,6 +384,8 @@ config :pleroma, :ldap,
base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
uid: System.get_env("LDAP_UID") || "cn"
config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail
# 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"