Merge branch 'email-blacklist' into 'develop'
authorlain <lain@soykaf.club>
Tue, 4 Aug 2020 11:00:30 +0000 (11:00 +0000)
committerlain <lain@soykaf.club>
Tue, 4 Aug 2020 11:00:30 +0000 (11:00 +0000)
Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837

1  2 
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/user.ex
test/user_test.exs

diff --cc CHANGELOG.md
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge