From: feld <feld@feld.me>
Date: Wed, 11 Mar 2020 16:53:05 +0000 (+0000)
Subject: Merge branch 'fix/signup-without-email' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2019f3b3ff365b61c14f01c736a6dcb68cb36624;p=akkoma

Merge branch 'fix/signup-without-email' into 'develop'

Allow account registration without an email

See merge request pleroma/pleroma!2246
---

2019f3b3ff365b61c14f01c736a6dcb68cb36624
diff --cc CHANGELOG.md
index 59f7dfcdd,462c7c2a3..100228c6c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -38,8 -38,8 +38,9 @@@ The format is based on [Keep a Changelo
  - Rate limiter is now disabled for localhost/socket (unless remoteip plug is enabled)
  - Logger: default log level changed from `warn` to `info`.
  - Config mix task `migrate_to_db` truncates `config` table before migrating the config file.
+ - Allow account registration without an email
  - Default to `prepare: :unnamed` in the database configuration.
 +- Instance stats are now loaded on startup instead of being empty until next hourly job.
  <details>
    <summary>API Changes</summary>