diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 13:50:12 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 13:50:12 +0300 |
| commit | 590c935d95f0ea4fb65994027a88a0623527af88 (patch) | |
| tree | 6b459dd8bc0fdb8c095e8f0088cb44d263f2e8d9 /config | |
| parent | 804173fc924ec591558b8ed7671e35b506be9345 (diff) | |
| parent | 9305e241cbbf78c634576dec58fb383563b39c58 (diff) | |
| download | pleroma-590c935d95f0ea4fb65994027a88a0623527af88.tar.gz pleroma-590c935d95f0ea4fb65994027a88a0623527af88.zip | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
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 2dc87a50c..604290544 100644 --- a/config/config.exs +++ b/config/config.exs @@ -396,6 +396,8 @@ config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies, oauth_consumer_enabled: oauth_consumer_strategies != [] +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" |