Alex S c349573791 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		2019-04-13 12:24:38 +07:00
..
admin_email.ex	Merge develop to 788-separate-email-addresses	2019-04-13 12:24:38 +07:00
mailer.ex	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	2019-04-10 06:33:19 +02:00
user_email.ex	Merge develop to 788-separate-email-addresses	2019-04-13 12:24:38 +07:00