Merge branch '114_email_confirmation' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 20 Dec 2018 13:28:36 +0000 (13:28 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 20 Dec 2018 13:28:36 +0000 (13:28 +0000)
[#114] Email confirmation

See merge request pleroma/pleroma!546

1  2 
docs/config.md
lib/pleroma/web/router.ex

diff --cc docs/config.md
Simple merge
Simple merge