kaniini 73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop' ... Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040		2019-04-16 18:44:07 +00:00
..
config.exs	Merge branch 'feature/788-separate-email-addresses' into 'develop'	2019-04-16 18:44:07 +00:00
dev.exs
emoji.txt
prod.exs
test.exs	Merge develop to 788-separate-email-addresses	2019-04-13 12:24:38 +07:00