diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-16 18:44:07 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-16 18:44:07 +0000 |
| commit | 73df3046e014ae16e03f16a9c82921652cefcb54 (patch) | |
| tree | 00a5d0bb027e65bfa3e7894b489dad7226aa645b /config | |
| parent | 02a53d00c93969ff99a460f69e92be5af2628691 (diff) | |
| parent | c5d0fffeaf64123334f62343d752467683a67229 (diff) | |
| download | pleroma-73df3046e014ae16e03f16a9c82921652cefcb54.tar.gz pleroma-73df3046e014ae16e03f16a9c82921652cefcb54.zip | |
Merge branch 'feature/788-separate-email-addresses' into 'develop'
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/test.exs | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 750e593e3..595e3505c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -201,6 +201,7 @@ config :pleroma, :http, config :pleroma, :instance, name: "Pleroma", email: "example@example.com", + notify_email: "noreply@example.com", description: "A Pleroma instance, an alternative fediverse server", limit: 5_000, remote_limit: 100_000, diff --git a/config/test.exs b/config/test.exs index 13a031d19..f93bc5994 100644 --- a/config/test.exs +++ b/config/test.exs @@ -23,6 +23,10 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" 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, |