From: Alex S <alex.strizhakov@gmail.com>
Date: Sat, 13 Apr 2019 05:24:38 +0000 (+0700)
Subject: Merge develop to 788-separate-email-addresses
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c349573791bfaca6e8c8c86c519c23397b088967;p=akkoma

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
---

c349573791bfaca6e8c8c86c519c23397b088967
diff --cc config/test.exs
index 2c4beaade,13a031d19..f93bc5994
--- a/config/test.exs
+++ b/config/test.exs
@@@ -21,12 -21,8 +21,12 @@@ config :pleroma, Pleroma.Upload, filter
  
  config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
  
- config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Test
+ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test
  
 +config :pleroma, :instance,
 +  email: "admin@example.com",
 +  notify_email: "noreply@example.com"
 +
  # Configure your database
  config :pleroma, Pleroma.Repo,
    adapter: Ecto.Adapters.Postgres,