You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		6 years ago
..
admin_email.ex	Merge develop to 788-separate-email-addresses	6 years ago
mailer.ex	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	6 years ago
user_email.ex	Merge develop to 788-separate-email-addresses	6 years ago