Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'

Allow users to remove their emails if instance does not need email to register

See merge request pleroma/pleroma!3522

diff --cc CHANGELOG.md
index 4758acc577eb423435e48cd1800d033d57816432,edd8b911af067cfa13a60c52fa292c87321e2900..6a1ae9cb6d68244b75c2c5b4e81ffc25ad40563d
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,11 -6,8 +6,12 @@@ The format is based on [Keep a Changelo
  
  ## Unreleased
  
 +### Removed
 +
 +- MastoFE
 +
  ### Changed
+ - Allow users to remove their emails if instance does not need email to register
  
  ### Added
  

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc test/pleroma/user_test.exs
Simple merge