diff options
author | Alex S <alex.strizhakov@gmail.com> | 2019-04-13 12:24:38 +0700 |
---|---|---|
committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-13 12:24:38 +0700 |
commit | c349573791bfaca6e8c8c86c519c23397b088967 (patch) | |
tree | d98225031c8ad1b3efe7c2917fd911d369953ca7 /config/dev.exs | |
parent | a64eb2b3893cee61f50d89b6ad4d273031ef0ea9 (diff) | |
parent | 334b2d78dc068f65fabf5b11aaa737dfd742d2f4 (diff) | |
download | pleroma-c349573791bfaca6e8c8c86c519c23397b088967.tar.gz pleroma-c349573791bfaca6e8c8c86c519c23397b088967.zip |
Merge develop to 788-separate-email-addresses
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
Diffstat (limited to 'config/dev.exs')
-rw-r--r-- | config/dev.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/dev.exs b/config/dev.exs index a7eb4b644..0432adce7 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -18,7 +18,7 @@ config :pleroma, Pleroma.Web.Endpoint, watchers: [], secure_cookie_flag: false -config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local +config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Local # ## SSL Support # |