Merge develop to 788-separate-email-addresses
authorAlex S <alex.strizhakov@gmail.com>
Sat, 13 Apr 2019 05:24:38 +0000 (12:24 +0700)
committerAlex S <alex.strizhakov@gmail.com>
Sat, 13 Apr 2019 05:24:38 +0000 (12:24 +0700)
commitc349573791bfaca6e8c8c86c519c23397b088967
treed98225031c8ad1b3efe7c2917fd911d369953ca7
parenta64eb2b3893cee61f50d89b6ad4d273031ef0ea9
parent334b2d78dc068f65fabf5b11aaa737dfd742d2f4
Merge develop to 788-separate-email-addresses

Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
config/config.exs
config/test.exs
docs/config.md
lib/pleroma/emails/admin_email.ex
lib/pleroma/emails/user_email.ex
test/web/mastodon_api/mastodon_api_controller_test.exs