From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Wed, 6 Oct 2021 05:44:44 +0000 (+0000)
Subject: Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=92a8ff59aa7f81e2463775669ada54f618d8c684;p=akkoma

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
---

92a8ff59aa7f81e2463775669ada54f618d8c684
diff --cc CHANGELOG.md
index 4758acc57,edd8b911a..6a1ae9cb6
--- a/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