Merge branch 'email-blacklist' into 'develop'

Add email blacklist, fixes #1404 Closes #1404 See merge request pleroma/pleroma!2837
2020-08-04 11:00:30 +00:00 · 2020-08-04 11:00:30 +00:00 · 28584bb224
commit 28584bb224
parent e3953923ac 2f4289d455
7 changed files with 70 additions and 9 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -516,7 +516,8 @@ config :pleroma, Pleroma.User,
    "user_exists",
    "users",
    "web"
-  ]
+  ],
+  email_blacklist: []

 config :pleroma, Oban,
  repo: Pleroma.Repo,