Merge branch 'feature/788-separate-email-addresses' into 'develop'
Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040
This commit is contained in:
commit
73df3046e0
12 changed files with 133 additions and 17 deletions
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue