Merge branch 'feature/788-separate-email-addresses' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 16 Apr 2019 18:44:07 +0000 (18:44 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 16 Apr 2019 18:44:07 +0000 (18:44 +0000)
commit73df3046e014ae16e03f16a9c82921652cefcb54
tree00a5d0bb027e65bfa3e7894b489dad7226aa645b
parent02a53d00c93969ff99a460f69e92be5af2628691
parentc5d0fffeaf64123334f62343d752467683a67229
Merge branch 'feature/788-separate-email-addresses' into 'develop'

Feature/788 separate email addresses

Closes #788

See merge request pleroma/pleroma!1040
config/config.exs
docs/config.md
test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/twitter_api_test.exs