diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-08-07 09:48:34 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-08-07 09:48:34 +0300 |
| commit | 8e90cc58e7ec3f19f03d049ff541750f1ab4774e (patch) | |
| tree | be0a4346827a52fcdfe034c489ede989320a24d2 /config/config.exs | |
| parent | 6e6276b4f8a7a46c6038480f6a842339c5214d1c (diff) | |
| parent | b9ebb55d2aabdf4c99b05efab9d4ad31b25f888d (diff) | |
| download | pleroma-8e90cc58e7ec3f19f03d049ff541750f1ab4774e.tar.gz pleroma-8e90cc58e7ec3f19f03d049ff541750f1ab4774e.zip | |
Merge branch 'develop' into feature/update-welcome-setting-in-description
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index fa8051e40..933a899ab 100644 --- 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, |