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)
commit28584bb2241c600fc6150fdae49b1eea6bd420e0
tree18f8334bdd3daffed7b033492539e3b867e8d15f
parente3953923aca1706ab508bfda1ab892304b29c09a
parent2f4289d455fbd2d949ac1e10d5ea2b9c78f15e82
Merge branch 'email-blacklist' into 'develop'

Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/user.ex
test/user_test.exs