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
..
admin
api	Merge branch 'feature/767-multiple-use-invite-token' into 'develop'	2019-04-10 10:10:08 +00:00
config	Custom Emoji docs: Make it clear that config.exs is not for lewd.	2019-04-15 15:51:17 +02:00
installation	docs/installation/arch_linux_en.md: Remove useless ODBC	2019-04-13 22:41:54 +02:00
clients.md
config.md	Merge branch 'feature/788-separate-email-addresses' into 'develop'	2019-04-16 18:44:07 +00:00
introduction.md