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
..
config.exs	Merge develop to 788-separate-email-addresses	2019-04-13 12:24:38 +07:00
dev.exs	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	2019-04-10 06:33:19 +02:00
emoji.txt	Adding tag to emoji ets table	2019-04-01 17:17:57 +07:00
prod.exs	[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.	2018-12-12 17:02:41 +03:00
test.exs	Merge develop to 788-separate-email-addresses	2019-04-13 12:24:38 +07:00