Merge branch 'feature/788-separate-email-addresses' into 'develop'

Feature/788 separate email addresses

Closes #788

See merge request pleroma/pleroma!1040

diff --cc config/config.exs
Simple merge

diff --cc docs/config.md
index 117fda9607e07b18ab161a3a0f3bf505a4ad6043,66e68229da64d526eaa79f3d7704448ebfbd8a3f..d618c5ddee1aaca75583f904d0c0eea86560718a
--- 1/docs/config.md
--- 2/docs/config.md
+++ b/docs/config.md
@@@ -442,10 -441,8 +443,10 @@@ Note: each strategy is shipped as a sep
  e.g. `OAUTH_CONSUMER_STRATEGIES="twitter facebook google microsoft" mix deps.get`.
  The server should also be started with `OAUTH_CONSUMER_STRATEGIES="..." mix phx.server` in case you enable any strategies.
  
- Note: each strategy requires separate setup (on external provider side and Pleroma side). Below are the guidelines on setting up most popular strategies.  
+ Note: each strategy requires separate setup (on external provider side and Pleroma side). Below are the guidelines on setting up most popular strategies.
  
 +Note: make sure that `"SameSite=Lax"` is set in `extra_cookie_attrs` when you have this feature enabled. OAuth consumer mode will not work with `"SameSite=Strict"`
 +
  * For Twitter, [register an app](https://developer.twitter.com/en/apps), configure callback URL to https://<your_host>/oauth/twitter/callback
  
  * For Facebook, [register an app](https://developers.facebook.com/apps), configure callback URL to https://<your_host>/oauth/facebook/callback, enable Facebook Login service at https://developers.facebook.com/apps/<app_id>/fb-login/settings/

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge

diff --cc test/web/twitter_api/twitter_api_test.exs
Simple merge